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//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//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 @@ --> + + +