CI(msvc): switch to Qt 6 and CMake

BLumia · Jul 6, 2024 · a4f2ab2 · a4f2ab2
1 parent 9fe3aca
commit a4f2ab2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -18,13 +18,17 @@ jobs:
       uses: jurplel/install-qt-action@v3
       with:
         arch: 'win64_msvc2019_64'
-        version: '5.15.2'
+        version: '6.4.3'
     - name: Build
       shell: cmd
       run: |
+        set PWD=%cd%
         set VS=${{ matrix.vs }}
         set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
         if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
         call %VCVARS% ${{ matrix.msvc_arch }}
-        qmake pineapple-pictures.pro
-        nmake
+        cmake -Bbuild . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%PWD%\build\"
+        cmake --build build
+        cmake --build build --target=install
+        windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler build\bin\ppic.exe
+        tree
diff --git a/app/aboutdialog.cpp b/app/aboutdialog.cpp
@@ -66,7 +66,7 @@ AboutDialog::AboutDialog(QWidget *parent)
 
     QFile translaterHtml(":/plain/translators.html");
     bool canOpenFile = translaterHtml.open(QIODevice::ReadOnly);
-    const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : "";
+    const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : QByteArrayLiteral("");
 
     const QStringList specialThanksStr {
         QStringLiteral("<h1 align='center'>%1</h1><a href='%2'>%3</a><p>%4</p>").arg(