diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-04-02 07:52:38 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-04-06 22:12:20 +0000 |
| commit | 8de1becd8e240512ada3e529c6c7bb16599dca2c (patch) | |
| tree | ec6d4ed0d31b916b34b06f010397c5b1fcfb8923 /share/qbs/module-providers/Qt/setup-qt.js | |
| parent | 6bba56d4104cad4ffd9175193a6dfc05a0de55d2 (diff) | |
Android: Correct qt6 test
Change-Id: I1f05ae51f30f0158cb3dec6ce189d96f52987c7a
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'share/qbs/module-providers/Qt/setup-qt.js')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 5cf1bcb44..c23d51d1b 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -268,8 +268,10 @@ function getQtProperties(qmakeFilePath, qbs) { (pathQueryValue(queryResult, "QT_INSTALL_DATA"), "mkspecs"); } - if (Utilities.versionCompare(qtProps.qtVersion, "6") >= 0) - qtProps.libExecPath = pathQueryValue(queryResult, "QT_INSTALL_LIBEXECS"); + if (Utilities.versionCompare(qtProps.qtVersion, "6") >= 0) { + qtProps.libExecPath = pathQueryValue(queryResult, "QT_HOST_LIBEXECS") + || pathQueryValue(queryResult, "QT_INSTALL_LIBEXECS"); + } if (!File.exists(qtProps.mkspecBasePath)) throw "Cannot extract the mkspecs directory."; |