From 32cb48e26cd079da591d55d92f849133c48683a3 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Wed, 20 May 2020 14:17:06 +0000
Subject: [PATCH] Revert "CMake: Don't create *Depends header for header-only
 modules"

This reverts commit e875f458055d6a7b54d2d853590ccc2495ab145b.

Reason for revert: syncqt creates a master header that includes
the *Depends header. Therefore we must always create the *Depends
header. Ignore for now that *Depends headers are empty and pointless
for module headers.

Change-Id: I1dcc836788b3d46c4f1b504d2d64e9eb67b66206
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 cmake/QtBuild.cmake       | 9 ++-------
 cmake/QtPostProcess.cmake | 3 +--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
index d50daf8458d..004e68c3b15 100644
--- a/cmake/QtBuild.cmake
+++ b/cmake/QtBuild.cmake
@@ -2167,7 +2167,6 @@ function(qt_add_module target)
     if(${arg_HEADER_MODULE})
         add_library("${target}" INTERFACE)
         set(is_interface_lib 1)
-        set_target_properties(${target} PROPERTIES INTERFACE_MODULE_IS_HEADER_ONLY TRUE)
     elseif(${arg_STATIC})
         add_library("${target}" STATIC)
     elseif(${QT_BUILD_SHARED_LIBS})
@@ -2287,11 +2286,7 @@ function(qt_add_module target)
         ### FIXME: Can we replace headers.pri?
         set(module_include_dir "${QT_BUILD_DIR}/${INSTALL_INCLUDEDIR}/${module_include_name}")
         qt_read_headers_pri("${module_include_dir}" "module_headers")
-        if(arg_HEADER_MODULE)
-            set(module_depends_header "")
-        else()
-            set(module_depends_header "${module_include_dir}/${module}Depends")
-        endif()
+        set(module_depends_header "${module_include_dir}/${module}Depends")
         if(is_framework)
             if(NOT is_interface_lib)
                 set(public_headers_to_copy "${module_headers_public}" "${module_depends_header}")
@@ -2300,7 +2295,7 @@ function(qt_add_module target)
             endif()
         else()
             set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${module_headers_public}")
-            set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER "${module_depends_header}")
+            set_property(TARGET ${target} APPEND PROPERTY PUBLIC_HEADER ${module_depends_header})
             set_property(TARGET ${target} APPEND PROPERTY PRIVATE_HEADER "${module_headers_private}")
         endif()
         if (NOT ${arg_HEADER_MODULE})
diff --git a/cmake/QtPostProcess.cmake b/cmake/QtPostProcess.cmake
index d1db4686b8b..e6e763c8fe4 100644
--- a/cmake/QtPostProcess.cmake
+++ b/cmake/QtPostProcess.cmake
@@ -169,8 +169,7 @@ function(qt_internal_create_module_depends_file target)
     endif()
 
     get_target_property(hasModuleHeaders "${target}" INTERFACE_MODULE_HAS_HEADERS)
-    get_target_property(isHeaderModule "${target}" INTERFACE_MODULE_IS_HEADER_ONLY)
-    if (hasModuleHeaders AND NOT isHeaderModule)
+    if (${hasModuleHeaders})
         get_target_property(module_include_name "${target}" INTERFACE_MODULE_INCLUDE_NAME)
         qt_internal_write_depends_file(${module_include_name} ${qtdeps})
     endif()