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

Try to find version specific qmake first

Browse Source 
Improve logging
This commit is contained in:
Adrian Schröter
2017-06-09 09:34:05 +02:00
parent 2f52ffe4c8
commit 2bbb0844b5
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+13 -9
View File
@@ -1031,19 +1031,22 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
QString qmakePath = "";
// The upstream name of the binary is "qmake", for Qt 4 and Qt 5
qmakePath = QStandardPaths::findExecutable("qmake");
// But openSUSE has qmake for Qt 4 and qmake-qt5 for Qt 5
// Try to find a version specific qmake first
// openSUSE has qmake for Qt 4 and qmake-qt5 for Qt 5
// Qt 4 on Fedora comes with suffix -qt4
// http://www.geopsy.org/wiki/index.php/Installing_Qt_binary_packages
if(qtDetected == 5){
qmakePath = QStandardPaths::findExecutable("qmake-qt5");
LogDebug() << "qmake 5";
} else if(qtDetected == 4){
qmakePath = QStandardPaths::findExecutable("qmake-qt4");
LogDebug() << "qmake 4";
}
if(qmakePath == ""){
if(qtDetected == 5){
qmakePath = QStandardPaths::findExecutable("qmake-qt5");
}
if(qtDetected == 4){
qmakePath = QStandardPaths::findExecutable("qmake-qt4");
}
// The upstream name of the binary is "qmake", for Qt 4 and Qt 5
qmakePath = QStandardPaths::findExecutable("qmake");
}
if(qmakePath == ""){
@@ -1051,6 +1054,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
exit(1);
}
LogNormal() << "Using qmake: " << qmakePath;
QString output = captureOutput(qmakePath + " -query");
LogDebug() << "-query output from qmake:" << output;