Merge branch 'main' into 'main'

gui/build.sh: also find qmake if it is named qmake5 See merge request !156

Merge branch 'main' into 'main'
6a359b11 · Sam Whited · 748852b2 · 8880485b · 6a359b11
Commit 6a359b11 authored 2 years ago by Sam Whited
--- a/gui/build.sh
+++ b/gui/build.sh
@@ -53,7 +53,7 @@ then
 else
    if [ "$QMAKE" == "" ]
    then
-        QMAKE=`which qmake`
+        QMAKE="$(command -v qmake5 || command -v qmake)"
    fi
 fi