From bc68c487eed34231dc92477e15b08df7094b6129 Mon Sep 17 00:00:00 2001 From: albexk Date: Thu, 16 Nov 2023 19:49:36 +0300 Subject: [PATCH] Update to qt 6.6.0 --- .github/workflows/deploy.yml | 2 +- client/cmake/android.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be570a064..173970478 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -275,7 +275,7 @@ jobs: env: ANDROID_BUILD_PLATFORM: android-34 - QT_VERSION: 6.5.3 + QT_VERSION: 6.6.0 QT_MODULES: 'qtremoteobjects qt5compat qtimageformats qtshadertools' steps: diff --git a/client/cmake/android.cmake b/client/cmake/android.cmake index 7511690d1..66ff1e15a 100644 --- a/client/cmake/android.cmake +++ b/client/cmake/android.cmake @@ -4,6 +4,9 @@ set(APP_ANDROID_MIN_SDK 24) set(ANDROID_PLATFORM "android-${APP_ANDROID_MIN_SDK}" CACHE STRING "The minimum API level supported by the application or library" FORCE) +# set QTP0002 policy: target properties that specify Android-specific paths may contain generator expressions +qt_policy(SET QTP0002 NEW) + set_target_properties(${PROJECT} PROPERTIES QT_ANDROID_VERSION_NAME ${CMAKE_PROJECT_VERSION} QT_ANDROID_VERSION_CODE ${APP_ANDROID_VERSION_CODE}