From 8e736c59ba277a5a621057ba4acdb1bd97502fb0 Mon Sep 17 00:00:00 2001
From: Laurent Trinques <scorpio@qelectrotech.org>
Date: Sun, 19 Jul 2026 18:55:26 +0200
Subject: [PATCH] New  Windows Qt5/Qt6 CI test, enable -platform
 windows:fontengine=freetype

---
 .github/workflows/windows-msi.yml  | 9 +++++++++
 build-aux/windows/Lancer QET.bat   | 2 +-
 build-aux/windows/QElectroTech.wxs | 7 +++++--
 misc/Lancer QET.bat                | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows-msi.yml b/.github/workflows/windows-msi.yml
index a07f1699f..f831c4f6f 100644
--- a/.github/workflows/windows-msi.yml
+++ b/.github/workflows/windows-msi.yml
@@ -244,6 +244,14 @@ jobs:
           Write-Host " ProductCode : $productCode"
           Write-Host " Output      : dist\$outputName"
 
+       if ("${{ matrix.flavor }}" -eq "qt5") {
+          $qtArgs = "-platform windows:fontengine=freetype"
+           }
+          else {
+          $qtArgs = ""
+           }
+
+
           wix build $wxs `
             -arch x64 `
             -d "Version=$version" `
@@ -251,6 +259,7 @@ jobs:
             -d "ProductCode=$productCode" `
             -d "FilesDir=$filesDir" `
             -d "LicenseRtf=$licRtf" `
+            -d QtPlatformArgs="$qtArgs" `
             -ext WixToolset.UI.wixext `
             -ext WixToolset.Util.wixext `
             -o "dist\$outputName"
diff --git a/build-aux/windows/Lancer QET.bat b/build-aux/windows/Lancer QET.bat
index 0a446769f..d42cbe09c 100755
--- a/build-aux/windows/Lancer QET.bat	
+++ b/build-aux/windows/Lancer QET.bat	
@@ -10,5 +10,5 @@ rem "C:/Users/<USER>/AppData/Local/QElectroTech/QElectroTech"
 rem Sans l'option --data-dir, les données utilisateur (elements, titleblocks,
 rem log, ...) de QElectroTech sont stockées dans
 rem "C:/Users/<USER>/AppData/Roaming/QElectroTech/QElectroTech"
-set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -style windowsvista %*
+set command=bin\qelectrotech.exe --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ -platform windows:fontengine=freetype %*
 @start %command%
diff --git a/build-aux/windows/QElectroTech.wxs b/build-aux/windows/QElectroTech.wxs
index f2e2bad63..7b0d97a18 100644
--- a/build-aux/windows/QElectroTech.wxs
+++ b/build-aux/windows/QElectroTech.wxs
@@ -11,6 +11,9 @@
 -->
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
      xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?ifndef QtPlatformArgs ?>
+  <?define QtPlatformArgs="" ?>
+  <?endif?>
 
   <Package
     Name="QElectroTech"
@@ -58,7 +61,7 @@
                   Directory="DesktopFolder"
                   Name="QElectroTech"
                   Target="[INSTALLDIR]bin\qelectrotech.exe"
-                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; -style windowsvista"
+                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; $(var.QtPlatformArgs)"
                   Icon="qet.ico"
                   WorkingDirectory="INSTALLDIR" />
         <RegistryValue Root="HKCU"
@@ -73,7 +76,7 @@
                   Directory="ProgramMenuFolder"
                   Name="QElectroTech"
                   Target="[INSTALLDIR]bin\qelectrotech.exe"
-                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; -style windowsvista"
+                  Arguments="--common-elements-dir=&quot;[INSTALLDIR]elements/&quot; --common-tbt-dir=&quot;[INSTALLDIR]titleblocks/&quot; --lang-dir=&quot;[INSTALLDIR]lang/&quot; $(var.QtPlatformArgs)"
                   Icon="qet.ico"
                   WorkingDirectory="INSTALLDIR" />
         <RegistryValue Root="HKCU"
diff --git a/misc/Lancer QET.bat b/misc/Lancer QET.bat
index d15234ea7..15401b267 100755
--- a/misc/Lancer QET.bat	
+++ b/misc/Lancer QET.bat	
@@ -8,5 +8,5 @@ rem Met la collection QET en lecture seule
 attrib +r elements/* /S /D
 
 rem lance QElectroTech
-set command=bin\qelectrotech.exe -platform windows:fontengine=freetype --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ --config-dir=conf/ --data-dir=conf/ -style plastique %*
+set command=bin\qelectrotech.exe -platform windows:fontengine=freetype --common-elements-dir=elements/ --common-tbt-dir=titleblocks/ --lang-dir=lang/ --config-dir=conf/ --data-dir=conf/  %*
 @start %command%