diff options
| author | Aki Koskinen <github@akikoskinen.info> | 2016-07-12 19:13:34 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-07-12 19:13:34 +0300 |
| commit | 63298066b1508a9546dbf61b86de718c5cbf57cf (patch) | |
| tree | 19bc0566f6c7e4a642e88347905e08f059906f70 | |
| parent | 86cebd4ccae1d0c5702ad75f1b0fb0d634bb8680 (diff) | |
| download | qtlocation-mapboxgl-63298066b1508a9546dbf61b86de718c5cbf57cf.tar.gz | |
[qt] if `qmake` isn't available, try `qmake-qt5` (#5658)
| -rw-r--r-- | platform/qt/scripts/configure.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 6b501d271c..42541032c0 100644 --- a/platform/qt/scripts/configure.sh +++ b/platform/qt/scripts/configure.sh @@ -38,7 +38,12 @@ fi function print_qt_flags { mason install Qt system - QT_VERSION_MAJOR=$(qmake -query QT_VERSION | cut -d. -f1) + QMAKE="qmake" + if [ ! $(which ${QMAKE} 2>/dev/null) ]; then + QMAKE="qmake-qt5" + fi + + QT_VERSION_MAJOR=$(${QMAKE} -query QT_VERSION | cut -d. -f1) CONFIG+=" 'qt_version_major%': ['${QT_VERSION_MAJOR}'],"$LN CONFIG+=" 'qt_image_decoders%': [0],"$LN |