From 4b2d47d76dddd3120d6c1a503cd90e8d4658f183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= Date: Tue, 8 Oct 2024 11:33:01 +0200 Subject: [PATCH 1/2] CI: windows: Update Qt --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c478f6605..e8507d9de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,7 +77,7 @@ jobs: uses: ./.github/actions/build-and-test windows: - name: Qt 6.5.3 / Windows + name: Qt 6.7.2 / Windows runs-on: windows-2022 steps: - uses: actions/checkout@v4 @@ -87,7 +87,7 @@ jobs: - name: Setup CMake uses: ./.github/actions/cmake with: - qt_version: 6.5.3 + qt_version: 6.7.2 qt_arch: win64_mingw use_qt6: ON modules: qtserialport qtwebsockets From 30d9f09900ad0c08faf355bea37993201e287538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kubern=C3=A1t?= Date: Tue, 8 Oct 2024 16:53:31 +0200 Subject: [PATCH 2/2] windows: Don't add unicode --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6fca7af8..d694c7901 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,10 +174,6 @@ if(LIBSHV_WITH_COREQT) function(qt_add_library target) add_library(${target} ${ARGN}) - if(WIN32) - target_compile_definitions(${target} PRIVATE UNICODE) - target_compile_definitions(${target} PRIVATE _UNICODE) - endif() endfunction() function(qt_add_executable)