From 8910951a4500fdbdcd5118cde148347d1f1a2ceb Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Fri, 30 Jul 2021 11:41:47 +0200
Subject: [PATCH] Use _qt_module_has_headers instead of
 INTERFACE_MODULE_HAS_HEADERS

After introducing the _qt_module_has_headers target property, it's
better to replace the INTERFACE_MODULE_HAS_HEADERS use by
_qt_module_has_headers since properties duplicate each other.

Change-Id: I4d62ed71b8ed8263f51d8575628693122580b4a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f0bb95cb6330cdb3e1b749ed5b1c222bbe3050bc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 cmake/QtModuleHelpers.cmake      | 2 --
 cmake/QtPostProcessHelpers.cmake | 2 +-
 cmake/QtPriHelpers.cmake         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake
index 4c1d3ee9c6d..19ce27d912f 100644
--- a/cmake/QtModuleHelpers.cmake
+++ b/cmake/QtModuleHelpers.cmake
@@ -274,7 +274,6 @@ function(qt_internal_add_module target)
     set_property(TARGET "${target}" APPEND PROPERTY EXPORT_PROPERTIES _qt_module_has_headers)
     if(${arg_NO_MODULE_HEADERS} OR ${arg_NO_SYNC_QT})
         set_target_properties("${target}" PROPERTIES
-            INTERFACE_MODULE_HAS_HEADERS OFF
             _qt_module_has_headers OFF)
     else()
         set_target_properties("${target}" PROPERTIES INTERFACE_MODULE_INCLUDE_NAME "${module_include_name}")
@@ -298,7 +297,6 @@ function(qt_internal_add_module target)
         endif()
 
         set_target_properties("${target}" PROPERTIES
-            INTERFACE_MODULE_HAS_HEADERS ON
             _qt_module_has_headers ON)
 
         ### FIXME: Can we replace headers.pri?
diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
index ee95a6703aa..8af6f0f321e 100644
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -247,7 +247,7 @@ function(qt_internal_create_module_depends_file target)
         list(REMOVE_DUPLICATES qtdeps)
     endif()
 
-    get_target_property(hasModuleHeaders "${target}" INTERFACE_MODULE_HAS_HEADERS)
+    get_target_property(hasModuleHeaders "${target}" _qt_module_has_headers)
     if (${hasModuleHeaders})
         get_target_property(module_include_name "${target}" INTERFACE_MODULE_INCLUDE_NAME)
         qt_internal_write_depends_file(${module_include_name} ${qtdeps})
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
index ed6513133f5..ad4625e5420 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
@@ -263,7 +263,7 @@ ${framework_base_path}/${fw_private_module_header_dir}")
         get_target_property(module_name_in_pri ${target} OUTPUT_NAME)
     endif()
 
-    get_target_property(hasModuleHeaders ${target} INTERFACE_MODULE_HAS_HEADERS)
+    get_target_property(hasModuleHeaders ${target} _qt_module_has_headers)
     if (NOT hasModuleHeaders)
         unset(public_module_includes)
         unset(private_module_includes)