From a28e8949694c99ac8bb3172d1c13489d05d283fa Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Mon, 4 Sep 2023 20:13:06 +0200 Subject: [PATCH] Windows: Use Qt 6 build --- appveyor.yml | 28 +++++++++++++++++++++++++--- shared/copyq.iss | 2 +- utils/appveyor/after_build.sh | 5 +---- utils/appveyor/before_build.sh | 1 + 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 94a16bf295..0eb2a7d07a 100644 --- a/appveyor.yml +++ b/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: diff --git a/shared/copyq.iss b/shared/copyq.iss index 865f5b7889..4f5374695a 100644 --- a/shared/copyq.iss +++ b/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 diff --git a/utils/appveyor/after_build.sh b/utils/appveyor/after_build.sh index c396b0cca4..a18442e342 100644 --- a/utils/appveyor/after_build.sh +++ b/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" diff --git a/utils/appveyor/before_build.sh b/utils/appveyor/before_build.sh index c5cceadc82..b31395bb46 100644 --- a/utils/appveyor/before_build.sh +++ b/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