From 28ed9e3e2d8f3be46d0498e06b7d9664f32dcfb8 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Wed, 7 Oct 2020 16:32:46 +0200
Subject: [PATCH] CMake: Set some additional info variables in
 Qt6CoreConfigExtras

Add info whether Qt was an infix built, and whether the reduce_exports
feature was enabled. These variable were set before in
Qt5CoreConfigExtras.cmake.

Change-Id: Id077763cfffd5ee6f1a7a28d04cf92dc46390c54
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 cmake/QtModuleHelpers.cmake              | 14 ++++++++++++++
 src/corelib/Qt6CoreConfigExtras.cmake.in |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index dfafa7eec9d..97a25fa38e8 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -427,6 +427,20 @@ function(qt_internal_add_module target)
         list(APPEND extra_cmake_includes "${INSTALL_CMAKE_NAMESPACE}${target}Macros.cmake")
     endif()
     if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in")
+        if(target STREQUAL Core)
+            set(extra_cmake_code "")
+            # Add some variables for compatibility with Qt5 config files.
+            if(QT_FEATURE_reduce_exports)
+                string(APPEND qtcore_extra_cmake_code "
+set(QT_VISIBILITY_AVAILABLE TRUE)")
+            endif()
+            if(QT_LIBINFIX)
+                string(APPEND qtcore_extra_cmake_code "
+set(QT_LIBINFIX \"${QT_LIBINFIX}\")")
+            endif()
+
+        endif()
+
         configure_file("${CMAKE_CURRENT_LIST_DIR}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake.in"
             "${config_build_dir}/${INSTALL_CMAKE_NAMESPACE}${target}ConfigExtras.cmake"
             @ONLY)
diff --git a/src/corelib/Qt6CoreConfigExtras.cmake.in b/src/corelib/Qt6CoreConfigExtras.cmake.in
index 6e56a20b29b..b7c30d52be0 100644
--- a/src/corelib/Qt6CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt6CoreConfigExtras.cmake.in
@@ -49,6 +49,8 @@ set(_Qt6CTestMacros "${_Qt6CoreConfigDir}/Qt6CTestMacros.cmake")
 
 _qt_internal_setup_startup_target()
 
+@qtcore_extra_cmake_code@
+
 if(ANDROID_PLATFORM)
     include("${CMAKE_CURRENT_LIST_DIR}/@QT_CMAKE_EXPORT_NAMESPACE@AndroidMacros.cmake")
 endif()