From e8d8b1a5e4c451833fbee9582e36724ba1ed0aa9 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 23 Nov 2020 08:44:59 +0100 Subject: [PATCH] CMake: Fix Android non-top-level build against qtbase Commit 9e0fb9c4fbe7a11c09a70d7ea1be97405c6bf0f8 introduced build failures in non-top-level builds when building Qt modules against qtbase. This was observed on in the CI for CentOS. Partly revert above commit by taking the old code path for non-top-level builds. Fixes: QTBUG-88718 Change-Id: I8926e1e4628ec5bdcea99e10497c1f65c10d072d Reviewed-by: Fabian Kosmale (cherry picked from commit 510186a218e63c88100efc38cb1611f122f94570) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 5216cebf668..bb2de0a0c25 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -570,5 +570,10 @@ macro(qt_examples_build_end) endmacro() if (ANDROID) - include(QtBuildInternals/QtBuildInternalsAndroid) + if(QT_SUPERBUILD) + include(QtBuildInternals/QtBuildInternalsAndroid) + else() + ### TODO: Find out why this is needed. See QTBUG-88718. + include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake) + endif() endif()