Search in the application path for qmake
This commit is contained in:
committed by
Aucos AG
parent
3182c36d66
commit
98f537a3a8
@@ -1001,6 +1001,11 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
|
||||
// Use the qmake executable passed in by the user:
|
||||
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()) {
|
||||
// Try to find a version specific qmake first
|
||||
// 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";
|
||||
}
|
||||
|
||||
if(qmakePath == ""){
|
||||
if(qmakePath.isEmpty()){
|
||||
// The upstream name of the binary is "qmake", for Qt 4 and Qt 5
|
||||
qmakePath = QStandardPaths::findExecutable("qmake");
|
||||
}
|
||||
}
|
||||
|
||||
if(qmakePath == ""){
|
||||
if(qmakePath.isEmpty()){
|
||||
LogError() << "qmake not found on the $PATH";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user