Merge pull request #116 from mhoeher/master

Allow the qmake executable to be passed on CLI

README.md

@@ -30,6 +30,7 @@ Options:
    -executable=<path>  : Let the given executable use the deployed libraries too
    -qmldir=<path>      : Scan for QML imports to bundle from the given directory, determined by Qt's qmlimportscanner
    -always-overwrite   : Copy files even if the target file exists
+   -qmake=<path>       : The qmake executable to use
    -no-translations    : Skip deployment of translations
 
 linuxdeployqt takes an application as input and makes it
@@ -54,7 +55,7 @@ Open in Qt Creator and build your application. Run it from the command line and
 
 #### QMake configuration
 
-__Important:__ `linuxdeployqt` deploys the Qt instance that qmake on the $PATH points to, so make sure that it is the correct one. Verify that qmake finds the correct Qt instance like this before running the `linuxdeployqt` tool:
+__Important:__ By default, `linuxdeployqt` deploys the Qt instance that qmake on the $PATH points to, so make sure that it is the correct one. Verify that qmake finds the correct Qt instance like this before running the `linuxdeployqt` tool:
 
 ```
 qmake -v
@@ -62,8 +63,11 @@ qmake -v
 QMake version 3.0
 Using Qt version 5.7.0 in /tmp/.mount_QtCreator-5.7.0-x86_64/5.7/gcc_64/lib
 ```
+
 If this does not show the correct path to your Qt instance that you want to be bundled, then adjust your `$PATH` to find the correct `qmake`.
 
+Alternatively, use the `-qmake` command line option to point the tool directly to the qmake executable to be used.
+
 #### Remove unecessary files
 
 Before running linuxdeployqt it may be wise to delete unneeded files that you do not wish to distribute from the build directory. These may be autogenerated during the build. You can delete them like so:

tests/tests.sh

@@ -79,6 +79,24 @@ killall QtWidgetsApplication && echo "SUCCESS"
 
 cd ../../../
 
+###############################################################################
+# Test bundling the sample Qt Widgets Application passing in the qmake exe
+###############################################################################
+
+cd tests/QtWidgetsApplication/build/
+mkdir -p explicitqmake
+
+cp QtWidgetsApplication explicitqmake/
+../../../linuxdeployqt-*-x86_64.AppImage explicitqmake/QtWidgetsApplication \
+    -qmake=$(which qmake)
+ldd explicitqmake/QtWidgetsApplication
+find explicitqmake/
+LD_DEBUG=libs explicitqmake/QtWidgetsApplication &
+sleep 5
+killall QtWidgetsApplication && echo "SUCCESS"
+
+cd ../../../
+
 ###############################################################################
 # Test bundling the sample Qt Quick Controls 2 Application that comes with Qt Creator
 ###############################################################################

tools/linuxdeployqt/main.cpp

@@ -55,14 +55,16 @@ int main(int argc, char **argv)
         qDebug() << "   -executable=<path>  : Let the given executable use the deployed libraries too";
         qDebug() << "   -qmldir=<path>      : Scan for QML imports in the given path";
         qDebug() << "   -always-overwrite   : Copy files even if the target file exists";
+        qDebug() << "   -qmake=<path>       : The qmake executable to use";
         qDebug() << "   -no-translations    : Skip deployment of translations.";
         qDebug() << "";
         qDebug() << "linuxdeployqt takes an application as input and makes it";
         qDebug() << "self-contained by copying in the Qt libraries and plugins that";
         qDebug() << "the application uses.";
         qDebug() << "";
-        qDebug() << "It deploys the Qt instance that qmake on the $PATH points to,";
-        qDebug() << "so make sure that it is the correct one.";
+        qDebug() << "By default it deploys the Qt instance that qmake on the $PATH points to.";
+        qDebug() << "The '-qmake' option can be used to point to the qmake executable";
+        qDebug() << "to be used instead.";
         qDebug() << "";
         qDebug() << "Plugins related to a Qt library are copied in with the library.";
         /* TODO: To be implemented
@@ -171,6 +173,7 @@ int main(int argc, char **argv)
     bool qmldirArgumentUsed = false;
     bool skipTranslations = false;
     QStringList qmlDirs;
+    QString qmakeExecutable;
 
     /* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
      * In this case, we want to construct an AppDir in /path/to. */
@@ -365,6 +368,10 @@ int main(int argc, char **argv)
         } else if (argument == QByteArray("-always-overwrite")) {
             LogDebug() << "Argument found:" << argument;
             alwaysOwerwriteEnabled = true;
+        } else if (argument.startsWith("-qmake=")) {
+            LogDebug() << "Argument found:" << argument;
+            int index = argument.indexOf("=");
+            qmakeExecutable = argument.mid(index+1);
         } else if (argument == QByteArray("-no-translations")) {
             LogDebug() << "Argument found:" << argument;
             skipTranslations = true;
@@ -381,7 +388,8 @@ int main(int argc, char **argv)
         }
     }
 
-    DeploymentInfo deploymentInfo = deployQtLibraries(appDirPath, additionalExecutables);
+    DeploymentInfo deploymentInfo = deployQtLibraries(appDirPath, additionalExecutables,
+                                                      qmakeExecutable);
 
     // Convenience: Look for .qml files in the current directoty if no -qmldir specified.
     if (qmlDirs.isEmpty()) {

tools/linuxdeployqt/shared.cpp

@@ -61,7 +61,7 @@ bool deployLibrary = false;
 using std::cout;
 using std::endl;
 
-QMap<QString,QString> qtToBeBundledInfo;
+static QMap<QString,QString> qtToBeBundledInfo;
 
 enum QtModule
 #if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_CC_MSVC)
@@ -202,7 +202,7 @@ QDebug operator<<(QDebug debug, const LibraryInfo &info)
     return debug;
 }
 
-QString bundleLibraryDirectory;
+static QString bundleLibraryDirectory;
 
 inline QDebug operator<<(QDebug debug, const AppDirInfo &info)
 {
@@ -981,7 +981,7 @@ static QString captureOutput(const QString &command)
     return process.readAllStandardOutput();
 }
 
-DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables)
+DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables, const QString& qmake)
 {
    AppDirInfo applicationBundle;
 
@@ -998,9 +998,10 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
        // Determine the location of the Qt to be bundled
        LogDebug() << "Using qmake to determine the location of the Qt to be bundled";
 
-       QString qmakePath = "";
-
+       // Use the qmake executable passed in by the user:
+       QString qmakePath = qmake;
 
+       if (qmakePath.isEmpty()) {
            // 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
@@ -1017,6 +1018,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
              // The upstream name of the binary is "qmake", for Qt 4 and Qt 5
              qmakePath = QStandardPaths::findExecutable("qmake");
            }
+       }
 
        if(qmakePath == ""){
            LogError() << "qmake not found on the $PATH";

tools/linuxdeployqt/shared.h

@@ -114,7 +114,9 @@ QString findAppBinary(const QString &appDirPath);
 QList<LibraryInfo> getQtLibraries(const QString &path, const QString &appDirPath, const QSet<QString> &rpaths);
 QList<LibraryInfo> getQtLibraries(const QStringList &lddLines, const QString &appDirPath, const QSet<QString> &rpaths);
 QString copyLibrary(const LibraryInfo &library, const QString path);
-DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &additionalExecutables);
+DeploymentInfo deployQtLibraries(const QString &appDirPath,
+                                 const QStringList &additionalExecutables,
+                                 const QString &qmake);
 DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,const QString &bundlePath, const QStringList &binaryPaths, bool useLoaderPath);
 void createQtConf(const QString &appDirPath);
 void createQtConfForQtWebEngineProcess(const QString &appDirPath);