diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-10 12:23:54 +0100 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-12-14 11:21:08 +0000 |
| commit | a3bd766f74ba6f95d1a1d5c1fffea3edd3946091 (patch) | |
| tree | a7ed19710115cc2f1492af9cbf1dcb6598b80e85 | |
| parent | 197242a9d11fa22c7348e8d12624e9bd13f4eba7 (diff) | |
Fix qt4 binary path detectionv1.18.0
Commit e8b186610738a16fe8ddaacd39797d863828c7aa removed the use of
QT_INSTALL_BINS property if QT_HOST_BINS doesn't exists to set the
binaryPath. But qt4 needs it because QT_HOST_BINS doesn't exist.
Change-Id: I3e5bc10d3b4839bd62a1202ff5cbc939f0a3b2b0
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index a50770b18..a67f79d89 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -246,7 +246,8 @@ function getQtProperties(qmakeFilePath, qbs) { qtProps.includePath = pathQueryValue(queryResult, "QT_INSTALL_HEADERS"); qtProps.libraryPath = pathQueryValue(queryResult, "QT_INSTALL_LIBS"); qtProps.hostLibraryPath = pathQueryValue(queryResult, "QT_HOST_LIBS"); - qtProps.binaryPath = pathQueryValue(queryResult, "QT_HOST_BINS"); + qtProps.binaryPath = pathQueryValue(queryResult, "QT_HOST_BINS") + || pathQueryValue(queryResult, "QT_INSTALL_BINS"); qtProps.installPath = pathQueryValue(queryResult, "QT_INSTALL_BINS"); qtProps.documentationPath = pathQueryValue(queryResult, "QT_INSTALL_DOCS"); qtProps.pluginPath = pathQueryValue(queryResult, "QT_INSTALL_PLUGINS"); |