# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1697197276 14400
# Node ID f04699caf98e186a25343e2c8dfff21a0913b545
# Parent  c3eff9a452538b10207d553fa1ba2df3333030fe
Update qt.conf generation when using qt6

* installer-files/post-install.bat,
  tools/makeinst-script.sh.in:
  : set qt paths to include qt6 when using qt6

diff -r c3eff9a45253 -r f04699caf98e installer-files/post-install.bat
--- a/installer-files/post-install.bat	Thu Oct 12 20:31:13 2023 +0200
+++ b/installer-files/post-install.bat	Fri Oct 13 07:41:16 2023 -0400
@@ -21,10 +21,14 @@
 ))
 
 Rem QT subdir path
-IF EXIST "%OCTAVE_HOME%\qt5" (
-  set QT_SUBDIR=qt5/
+IF EXIST "%OCTAVE_HOME%\qt6" (
+  set QT_SUBDIR=qt6/
 ) ELSE (
-  set QT_SUBDIR=
+  IF EXIST "%OCTAVE_HOME%\qt5" (
+    set QT_SUBDIR=qt5/
+  ) ELSE (
+    set QT_SUBDIR=
+  )
 )
 
 Rem Create qt.conf
diff -r c3eff9a45253 -r f04699caf98e tools/makeinst-script.sh.in
--- a/tools/makeinst-script.sh.in	Thu Oct 12 20:31:13 2023 +0200
+++ b/tools/makeinst-script.sh.in	Fri Oct 13 07:41:16 2023 -0400
@@ -16,10 +16,14 @@
 cd `dirname $1`
 MXEDIR=`cd ..; pwd`
 
-if [ "@ENABLE_QT5@" == "yes" ]; then
-  QT_SUBDIR=qt5/
+if [ "@ENABLE_QT@" == "4" ]; then
+  QT_SUBDIR=
 else
-  QT_SUBDIR=
+  if [ "@ENABLE_QT@" == "5" ]; then
+    QT_SUBDIR=qt5/
+  else
+    QT_SUBDIR=qt6/
+  fi
 fi
 
 if [ "@USE_MSYS2@" == "yes" ]; then