From b220b219f39da62d2ff689f6c3586ae21633f28d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 8 Sep 2022 11:06:56 +0200 Subject: [PATCH] Pass QT_NO_PACKAGE_VERSION_CHECK to the Android multi-ABI external projects The QT_NO_PACKAGE_VERSION_CHECK flag should be considered by multi-ABI external projects when it's set in the main project. Fixes: QTBUG-106394 Change-Id: Ief4ca1272f08f074d6c93d923efabdc13acd3add Reviewed-by: Alexandru Croitor (cherry picked from commit da635dfced9961cf9f16b273f625acd2d9b0c3ab) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 2a9d6b5a7a9..bff38abf70d 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -967,6 +967,10 @@ function(_qt_internal_configure_android_multiabi_target target) list(APPEND extra_cmake_args "-DANDROID_NDK_ROOT=${ANDROID_NDK}") endif() + if(DEFINED QT_NO_PACKAGE_VERSION_CHECK) + list(APPEND extra_cmake_args "-DQT_NO_PACKAGE_VERSION_CHECK=${QT_NO_PACKAGE_VERSION_CHECK}") + endif() + if(CMAKE_MAKE_PROGRAM) list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") endif()