New Windows Qt5/Qt6 CI test, enable -platform windows:fontengine=freetype

.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"

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%

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"

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%