From b2c52a9aeed40b65e41107bc4ac3bbb23b803ff0 Mon Sep 17 00:00:00 2001 From: Abdel-Rahman A Date: Tue, 10 Apr 2018 08:52:08 +0200 Subject: [PATCH] build.sh: Check for qmake-qt5 (#434) --- build.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index ca47e20a..e886b087 100755 --- a/build.sh +++ b/build.sh @@ -21,8 +21,11 @@ if [ $? = 0 ]; then fi fi -# Check if qmake is available -qmakepath=$(which qmake) +# Check if either qmake or qmake-qt5 is available +qmakepath=$(which qmake-qt5) +if [ -z "$qmakepath" ]; then + qmakepath=$(which qmake) +fi if [ -z "$qmakepath" ]; then echo "You need qmake to build Cutter." echo "Please make sure qmake is in your PATH environment variable." @@ -50,7 +53,7 @@ fi # Build mkdir "$BUILD" cd "$BUILD" || exit 1 -qmake "$QMAKE_CONF" ../src/Cutter.pro +"$qmakepath" "$QMAKE_CONF" ../src/Cutter.pro make -j4 ERR=$((ERR+$?)) cd ..