From 784af6eb9da9d58fc877c3a7cb7042fa3e437a5b Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Thu, 9 Jun 2022 03:55:52 +0300
Subject: [PATCH 32/32] installer_cross: Build ruledit-installer in Qt6-mode

See osdn #44699

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 windows/installer_cross/build_all_installers.sh |  2 +-
 windows/installer_cross/installer_build.sh      |  4 ++--
 windows/installer_cross/winbuild.sh             | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/windows/installer_cross/build_all_installers.sh b/windows/installer_cross/build_all_installers.sh
index 6f631a2754..ec4bdbc3f4 100755
--- a/windows/installer_cross/build_all_installers.sh
+++ b/windows/installer_cross/build_all_installers.sh
@@ -91,7 +91,7 @@ else
   SDL2="Success"
 fi
 
-if test "x$CROSSER_QT5" != "xyes" ; then
+if test "$CROSSER_QT6" != "yes" ; then
   RULEDIT="N/A"
 elif ! ./installer_build.sh $DLLSPATH ruledit ; then
   RET=1
diff --git a/windows/installer_cross/installer_build.sh b/windows/installer_cross/installer_build.sh
index 157a181574..1e1560c608 100755
--- a/windows/installer_cross/installer_build.sh
+++ b/windows/installer_cross/installer_build.sh
@@ -214,8 +214,8 @@ if test "x$GUI" = "xruledit" ; then
     exit 1
   fi
 
-  if ! add_qt5_env $DLLSPATH $INSTDIR ; then
-    echo "Copying Qt5 environment failed!" >&2
+  if ! add_qt6_env $DLLSPATH $INSTDIR ; then
+    echo "Copying Qt6 environment failed!" >&2
     exit 1
   fi
 
diff --git a/windows/installer_cross/winbuild.sh b/windows/installer_cross/winbuild.sh
index c331c575b3..14e96200f3 100755
--- a/windows/installer_cross/winbuild.sh
+++ b/windows/installer_cross/winbuild.sh
@@ -7,7 +7,7 @@
 # This script is licensed under Gnu General Public License version 2 or later.
 # See COPYING available from the same location you got this script.
 
-# Version 2.4.0 (30-Jan-22)
+# Version 2.4.1 (09-Jun-22)
 
 WINBUILD_VERSION="2.4.0"
 MIN_WINVER=0x0601 # Windows 7
@@ -123,15 +123,15 @@ else
   VERREV="win32-$VERREV"
 fi
 
-if test "x$SINGLE_GUI" != "xtrue" || test "x$2" = "xruledit" ; then
-  if grep "CROSSER_QT5" $DLLSPATH/crosser.txt | grep yes > /dev/null
-  then
-    QT5="yes"
-    QTVER="Qt5"
-  elif grep "CROSSER_QT6" $DLLSPATH/crosser.txt | grep yes > /dev/null
+if test "$SINGLE_GUI" != "true" || test "$2" = "ruledit" ; then
+  if grep "CROSSER_QT6" $DLLSPATH/crosser.txt | grep yes > /dev/null
   then
     QT6="yes"
     QTVER="Qt6"
+  elif grep "CROSSER_QT5" $DLLSPATH/crosser.txt | grep yes > /dev/null
+  then
+    QT5="yes"
+    QTVER="Qt5"
   fi
 fi
 
-- 
2.35.1