at master 864 B view raw
1--- a/src/linguist/shared/runqttool.cpp 2+++ b/src/linguist/shared/runqttool.cpp 3@@ -20,9 +20,21 @@ class FMT { 4 Q_DECLARE_TR_FUNCTIONS(Linguist) 5 }; 6 7+static QString qtBasePath(QLibraryInfo::LibraryPath location) 8+{ 9+ switch (location) { 10+ case QLibraryInfo::BinariesPath: 11+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/bin"); 12+ case QLibraryInfo::LibraryExecutablesPath: 13+ return QLatin1String(NIX_OUTPUT_OUT) + QLatin1String("/libexec"); 14+ default: 15+ return QLibraryInfo::path(location); 16+ } 17+} 18+ 19 static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location) 20 { 21- QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName; 22+ QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName; 23 #ifdef Q_OS_WIN 24 filePath.append(QLatin1String(".exe")); 25 #endif