diff --git a/.github/workflows/ci_windows.yaml b/.github/workflows/ci_windows.yaml index becfeee9c..cc2f8969a 100644 --- a/.github/workflows/ci_windows.yaml +++ b/.github/workflows/ci_windows.yaml @@ -34,11 +34,10 @@ jobs: # use the preinstalled vcpkg from image # https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md#package-management - name: Setup vcpkg - uses: lukka/run-vcpkg@v7 + uses: lukka/run-vcpkg@v10 with: vcpkgDirectory: C:/vcpkg doNotUpdateVcpkg: true # the preinstalled vcpkg is updated regularly - setupOnly: true - name: Install dependencies from vcpkg run: | diff --git a/winconf.pri b/winconf.pri index b5af8d11d..d6be8f045 100644 --- a/winconf.pri +++ b/winconf.pri @@ -1,3 +1,5 @@ +CONFIG += c++17 + # After 1.55 some Windows users reported regular UI freezes. # This makes ASIO use the pre-1.56 way of doing things. See issue #2003 DEFINES += BOOST_ASIO_DISABLE_CONNECTEX @@ -32,15 +34,14 @@ win32-g++*|win32-clang-g++* { DEFINES += _FILE_OFFSET_BITS=64 DEFINES += __USE_W32_SOCKETS - QMAKE_CXXFLAGS += -std=c++17 - RC_FILE = qbittorrent_mingw.rc LIBS += libadvapi32 libiphlpapi libole32 libpowrprof libshell32 libuser32 libwsock32 libws2_32 } else:win32-msvc* { CONFIG -= embed_manifest_exe - QMAKE_CXXFLAGS += /std:c++17 /utf-8 + + QMAKE_CXXFLAGS += /utf-8 QMAKE_LFLAGS += "/MANIFEST:EMBED /MANIFESTINPUT:$$quote($${PWD}/src/qbittorrent.exe.manifest) /STACK:0x800000" RC_FILE = qbittorrent.rc