diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be570a06..17397047 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 7511690d..66ff1e15 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}