From da3417123a92c556f80cb4f9d63f765ef6e1537a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 3 Feb 2022 21:26:23 -0800 Subject: [PATCH] build-system: take Qt6 into account We should find qmake - but in case there's only a qmake-qt6 binary, try to use that. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 33d021674..5619af37f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -225,7 +225,8 @@ fi if [[ -z $QMAKE || ! -x $QMAKE ]] ; then hash qmake > /dev/null 2> /dev/null && QMAKE=qmake [ -z $QMAKE ] && hash qmake-qt5 > /dev/null 2> /dev/null && QMAKE=qmake-qt5 - [ -z $QMAKE ] && echo "cannot find qmake or qmake-qt5" && exit 1 + [ -z $QMAKE ] && hash qmake-qt6 > /dev/null 2> /dev/null && QMAKE=qmake-qt6 + [ -z $QMAKE ] && echo "cannot find qmake, qmake-qt5, or qmake-qt6" && exit 1 fi # it's not entirely clear why we only set this on macOS, but this appears to be what works