Mercurial > hg > svcore
comparison base/HelperExecPath.cpp @ 1783:cf3eb6252f42
Fix calculation of binary name (don't include full path!)
author | Chris Cannam |
---|---|
date | Tue, 17 Sep 2019 10:42:55 +0100 |
parents | 2a810ed46977 |
children |
comparison
equal
deleted
inserted
replaced
1782:2a810ed46977 | 1783:cf3eb6252f42 |
---|---|
70 // | 70 // |
71 // 4. in <mydir> | 71 // 4. in <mydir> |
72 | 72 |
73 QStringList dirs; | 73 QStringList dirs; |
74 QString appName = QCoreApplication::applicationName(); | 74 QString appName = QCoreApplication::applicationName(); |
75 QString binaryName = QCoreApplication::arguments().at(0); | |
76 QString myDir = QCoreApplication::applicationDirPath(); | 75 QString myDir = QCoreApplication::applicationDirPath(); |
76 QString binaryName = QFileInfo(QCoreApplication::arguments().at(0)) | |
77 .fileName(); | |
78 | |
77 #ifdef Q_OS_MAC | 79 #ifdef Q_OS_MAC |
78 dirs.push_back(myDir + "/../Resources"); | 80 dirs.push_back(myDir + "/../Resources"); |
79 #else | 81 #else |
80 #ifndef Q_OS_WIN32 | 82 #ifndef Q_OS_WIN32 |
81 dirs.push_back(myDir + "/../lib/" + binaryName); | 83 if (binaryName != "") { |
84 dirs.push_back(myDir + "/../lib/" + binaryName); | |
85 } | |
82 dirs.push_back(myDir + "/../lib/" + appName); | 86 dirs.push_back(myDir + "/../lib/" + appName); |
83 #endif | 87 #endif |
84 dirs.push_back(myDir + "/helpers"); | 88 dirs.push_back(myDir + "/helpers"); |
85 #endif | 89 #endif |
86 dirs.push_back(myDir); | 90 dirs.push_back(myDir); |