Windows: Use Qt 6 build

appveyor.yml

@@ -19,17 +19,39 @@ environment:
   SNORETOAST_VERSION: 0.9.0
 
   matrix:
-    - QTDIR: /c/Qt/5.15/msvc2019_64
+    # - QTDIR: /c/Qt/5.15/msvc2019_64
+    #   CMAKE_GENERATOR: Visual Studio 16 2019
+    #   CMAKE_GENERATOR_ARCH: x64
+    #   BUILD_SUB_DIR: Release
+    #   # https://wiki.qt.io/Qt_5.15_Tools_and_Versions
+    #   # https://www.appveyor.com/docs/windows-images-software/#tools
+    #   OPENSSL_PATH: /c/OpenSSL-v111-Win64/bin
+    #   LIBSSL: libssl-1_1-x64.dll
+    #   LIBCRYPTO: libcrypto-1_1-x64.dll
+    #   WITH_NATIVE_NOTIFICATIONS: "ON"
+    #   WITH_QT6: "OFF"
+    #   WINDEPLOYQT_ARGS: >-
+    #     --no-system-d3d-compiler
+    #     --no-angle
+    #     --no-opengl-sw
+    #     --no-quick
+
+    - QTDIR: /c/Qt/6.5/msvc2019_64
       CMAKE_GENERATOR: Visual Studio 16 2019
       CMAKE_GENERATOR_ARCH: x64
       BUILD_SUB_DIR: Release
-      # https://wiki.qt.io/Qt_5.15_Tools_and_Versions
+      # https://wiki.qt.io/Qt_6.5_Tools_and_Versions
       # https://www.appveyor.com/docs/windows-images-software/#tools
       OPENSSL_PATH: /c/OpenSSL-v111-Win64/bin
       LIBSSL: libssl-1_1-x64.dll
       LIBCRYPTO: libcrypto-1_1-x64.dll
-      WITH_NATIVE_NOTIFICATIONS: "ON"
       GPGPATH: /c/Program Files/Git/usr/bin
+      WITH_NATIVE_NOTIFICATIONS: "OFF"
+      WITH_QT6: "ON"
+      WINDEPLOYQT_ARGS: >-
+        --no-system-d3d-compiler
+        --no-opengl-sw
+        --no-quick
 
 # Parameters for default build commands (build_script is used instead).
 build:

shared/copyq.iss

@@ -156,7 +156,7 @@ Source: "{#Root}\plugins\*itemtags.dll"; DestDir: "{app}\plugins"; Components: p
 Source: "{#Root}\plugins\*itempinned.dll"; DestDir: "{app}\plugins"; Components: plugins/pinned; Flags: ignoreversion
 
 ; Qt and toolchain
-Source: "{#Root}\bearer\*.dll"; DestDir: "{app}\bearer"; Components: program; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: "{#Root}\bearer\*.dll"; DestDir: "{app}\bearer"; Components: program; Flags: ignoreversion recursesubdirs createallsubdirs skipifsourcedoesntexist
 Source: "{#Root}\imageformats\*.dll"; DestDir: "{app}\imageformats"; Components: program; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#Root}\platforms\*.dll"; DestDir: "{app}\platforms"; Components: program; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "{#Root}\styles\*.dll"; DestDir: "{app}\styles"; Components: program; Flags: ignoreversion recursesubdirs createallsubdirs

utils/appveyor/after_build.sh

@@ -42,10 +42,7 @@ cp -v "$OPENSSL_PATH/$LIBSSL" "$Destination"
 
 "$QTDIR/bin/windeployqt" --help
 "$QTDIR/bin/windeployqt" \
-    --no-system-d3d-compiler \
-    --no-angle \
-    --no-opengl-sw \
-    --no-quick \
+    $WINDEPLOYQT_ARGS \
     "${kf5_libraries[@]}" \
     "$Executable"
 

utils/appveyor/before_build.sh

@@ -39,4 +39,5 @@ cmake -B"$BUILD_PATH" -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH" \
     -DCMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION=. \
     -DWITH_NATIVE_NOTIFICATIONS="$WITH_NATIVE_NOTIFICATIONS" \
+    -DWITH_QT6="$WITH_QT6" \
     -DWITH_TESTS=ON