diff --git a/cmake/QtPlatformTargetHelpers.cmake b/cmake/QtPlatformTargetHelpers.cmake index 4ea305b8b28..33b49960984 100644 --- a/cmake/QtPlatformTargetHelpers.cmake +++ b/cmake/QtPlatformTargetHelpers.cmake @@ -31,7 +31,7 @@ function(qt_internal_setup_public_platform_target) # in order to satisfy linker dependencies. Both of these libraries are part of # the NDK. if (ANDROID) - if(QT_FEATURE_android_16kb_pages AND (CMAKE_ANDROID_NDK_VERSION VERSION_LESS "28.0.0")) + if(QT_FEATURE_android_16kb_pages) target_link_options(Platform INTERFACE "-Wl,-z,max-page-size=16384") endif() target_link_libraries(Platform INTERFACE log) diff --git a/configure.cmake b/configure.cmake index 6f348cf1067..49cb0baaa64 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1544,8 +1544,8 @@ qt_configure_add_report_entry( ) qt_configure_add_report_entry( TYPE NOTE - MESSAGE "Building Qt for Android with 16KB page sizes." - CONDITION QT_FEATURE_android_16kb_pages AND (CMAKE_ANDROID_NDK_VERSION VERSION_LESS "28.0.0") + MESSAGE "Building Qt for Android and user projects with 16KB page sizes." + CONDITION QT_FEATURE_android_16kb_pages ) if(WASM) qt_extra_definition("QT_EMCC_VERSION" "\"${EMCC_VERSION}\"" PUBLIC)