syncqt: don't write INJECTED_*HEADERS

these are actually redundant with INJECTIONS. Change-Id: I0a71930401e00d30c9898b4d958de5e89c496d18 Reviewed-by: Joerg Bornemann <[email protected]> Reviewed-by: Alexandru Croitor <[email protected]>
ClassAteam · Apr 25, 2018 · 967bb3f · 967bb3f
1 parent 8c57663
commit 967bb3f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -922,9 +922,7 @@ ($$)
     #information used after the syncing
     my $pri_install_gfiles = "";
     my $pri_install_files = "";
-    my $pri_install_ifiles = "";
     my $pri_install_pfiles = "";
-    my $pri_install_ipfiles = "";
     my $pri_install_qpafiles = "";
     my $pri_injections = "";
     my $pri_clean_files = "";
@@ -1092,9 +1090,7 @@ ($$)
                                     $injection .= ":$class";
                                 }
 
-                                if ($shadow) {
-                                    $pri_install_ifiles .= "$pri_install_iheader ";
-                                } else {
+                                if (!$shadow) {
                                     # put it into the master file
                                     $master_contents{$public_header} = $requires if (shouldMasterInclude($iheader));
 
@@ -1106,10 +1102,7 @@ ($$)
                             elsif ($qpa_header) {
                                 $pri_install_qpafiles.= "$pri_install_iheader ";;
                             }
-                            elsif ($shadow) {
-                                $pri_install_ipfiles .= "$pri_install_iheader ";
-                            }
-                            else {
+                            elsif (!$shadow) {
                                 $pri_install_pfiles.= "$pri_install_iheader ";;
                             }
                             $pri_injections .= fixPaths($iheader, "$out_basedir/include/$lib")
@@ -1232,10 +1225,8 @@ ($$)
         #handle the headers.pri for each module
         my $headers_pri_contents = "";
         $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
-        $headers_pri_contents .= "SYNCQT.INJECTED_HEADER_FILES = $pri_install_ifiles\n";
         $headers_pri_contents .= "SYNCQT.GENERATED_HEADER_FILES = $pri_install_gfiles\n";
         $headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
-        $headers_pri_contents .= "SYNCQT.INJECTED_PRIVATE_HEADER_FILES = $pri_install_ipfiles\n";
         $headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n";
         $headers_pri_contents .= "SYNCQT.CLEAN_HEADER_FILES = $pri_clean_files\n";
         $headers_pri_contents .= "SYNCQT.INJECTIONS = $pri_injections\n";

diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
@@ -114,8 +114,6 @@ syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_)
 syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_)
 syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_)
 syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME)
-syncQtResolve(INJECTED_HEADER_FILES, $$OUT_PWD)
-syncQtResolve(INJECTED_PRIVATE_HEADER_FILES, $$OUT_PWD)
 !lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
     CONFIG += qt_install_headers
 
@@ -128,8 +126,6 @@ exists($$OUT_PWD/qt$${MODULE}-config.h) {
     SYNCQT.INJECTIONS += \
         $$fwd_rel/qt$${MODULE}-config.h:qt$${MODULE}-config.h \
         $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
-    SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/qt$${MODULE}-config.h
-    SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/qt$${MODULE}-config_p.h
 }
 
 for (injection, SYNCQT.INJECTIONS) {
@@ -142,6 +138,10 @@ for (injection, SYNCQT.INJECTIONS) {
     write_file($$MAIN_FWD, MAIN_FWD_CONT)|error()
     equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr)
     !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD
+    !contains(ofwd_hdr, .*/private/.*): \
+        SYNCQT.INJECTED_HEADER_FILES += $$dst_hdr
+    else: \
+        SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$dst_hdr
     injects = $$member(injects, 2, -1)
     for (inject, injects) {
         CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject