From 63298066b1508a9546dbf61b86de718c5cbf57cf Mon Sep 17 00:00:00 2001 From: Aki Koskinen Date: Tue, 12 Jul 2016 19:13:34 +0300 Subject: [PATCH] [qt] if `qmake` isn't available, try `qmake-qt5` (#5658) --- platform/qt/scripts/configure.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/qt/scripts/configure.sh b/platform/qt/scripts/configure.sh index 6b501d271..42541032c 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