diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2020-09-14 10:05:21 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-16 13:08:47 +0000 |
| commit | cc67bbbee6386c10c8282b3ea02f6db654d60c1e (patch) | |
| tree | a69bfac69bffdfaecbeaa504c72e6f9f91add27f /src/shared | |
| parent | 15d7a30d41b423846fc74d9dd252c1e2a84769e2 (diff) | |
| download | qttools-cc67bbbee6386c10c8282b3ea02f6db654d60c1e.tar.gz | |
windeployqt: Add optional qmake parameter
In a crosscompilation setup (for example Windows arm64) windeployqt will
pick up the wrong Qt libraries. At the moment qmake is the only way to
determine information about the Qt build even if cmake was used to build
Qt. By passing the path to the proper qmake, windeployqt will deploy
the correct libraries for the build.
Change-Id: I14992b1c27cce774440fa16abcc2abb30bec641a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/winutils/utils.cpp | 4 | ||||
| -rw-r--r-- | src/shared/winutils/utils.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp index aaad905a0..4656e0599 100644 --- a/src/shared/winutils/utils.cpp +++ b/src/shared/winutils/utils.cpp @@ -494,12 +494,12 @@ QString findInPath(const QString &file) const char *qmakeInfixKey = "QT_INFIX"; -QMap<QString, QString> queryQMakeAll(QString *errorMessage) +QMap<QString, QString> queryQMakeAll(const QString &qmakeBinary, QString *errorMessage) { + const QString binary = !qmakeBinary.isEmpty() ? qmakeBinary : QStringLiteral("qmake"); QByteArray stdOut; QByteArray stdErr; unsigned long exitCode = 0; - const QString binary = QStringLiteral("qmake"); if (!runProcess(binary, QStringList(QStringLiteral("-query")), QString(), &exitCode, &stdOut, &stdErr, errorMessage)) return QMap<QString, QString>(); if (exitCode) { diff --git a/src/shared/winutils/utils.h b/src/shared/winutils/utils.h index 951ebf773..548d5305c 100644 --- a/src/shared/winutils/utils.h +++ b/src/shared/winutils/utils.h @@ -173,7 +173,7 @@ QString findInPath(const QString &file); extern const char *qmakeInfixKey; // Fake key containing the libinfix -QMap<QString, QString> queryQMakeAll(QString *errorMessage); +QMap<QString, QString> queryQMakeAll(const QString &qmakeBinary, QString *errorMessage); QString queryQMake(const QString &variable, QString *errorMessage); enum DebugMatchMode { |