TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Search in the application path for qmake

Browse Source
This commit is contained in:
Henner Kollmann
2017-10-13 13:25:44 +02:00
committed by Aucos AG
parent 3182c36d66
commit 98f537a3a8
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/shared.cpp
+7 -2
View File
@@ -1001,6 +1001,11 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
// Use the qmake executable passed in by the user: // Use the qmake executable passed in by the user:
QString qmakePath = qmake; QString qmakePath = qmake;
if (qmakePath.isEmpty()) {
// Try to find qmake in the same path as the executable
QString path = QCoreApplication::applicationDirPath();
qmakePath = QStandardPaths::findExecutable("qmake", QStringList(path));
}
if (qmakePath.isEmpty()) { if (qmakePath.isEmpty()) {
// Try to find a version specific qmake first // Try to find a version specific qmake first
// openSUSE has qmake for Qt 4 and qmake-qt5 for Qt 5 // openSUSE has qmake for Qt 4 and qmake-qt5 for Qt 5
@@ -1014,13 +1019,13 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
LogDebug() << "qmake 4"; LogDebug() << "qmake 4";
} }
if(qmakePath == ""){ if(qmakePath.isEmpty()){
// The upstream name of the binary is "qmake", for Qt 4 and Qt 5 // The upstream name of the binary is "qmake", for Qt 4 and Qt 5
qmakePath = QStandardPaths::findExecutable("qmake"); qmakePath = QStandardPaths::findExecutable("qmake");
} }
} }
if(qmakePath == ""){ if(qmakePath.isEmpty()){
LogError() << "qmake not found on the $PATH"; LogError() << "qmake not found on the $PATH";
exit(1); exit(1);
} }