1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass QT_NO_PACKAGE_VERSION_CHECK to the Android multi-ABI external projects

Browse Source 
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 <alexandru.croitor@qt.io>
(cherry picked from commit da635dfced9961cf9f16b273f625acd2d9b0c3ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2022-09-08 11:06:56 +02:00 committed by Qt Cherry-pick Bot
parent 897071229c
commit b220b219f3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6AndroidMacros.cmake
View File

@ -967,6 +967,10 @@ function(_qt_internal_configure_android_multiabi_target target)
list(APPEND extra_cmake_args "-DANDROID_NDK_ROOT=${ANDROID_NDK}") list(APPEND extra_cmake_args "-DANDROID_NDK_ROOT=${ANDROID_NDK}")
endif() 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) if(CMAKE_MAKE_PROGRAM)
list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
endif() endif()