don't include injected headers into linker version script

it makes no sense to version them, as they contain only #defines anyway. it also removes the need to special-case their location in shadow builds with pre-synced headers, which we actually failed to do anyway. Task-number: QTBUG-56286 Change-Id: I4ea717f7be56494cfea0572389bea173d7470b6e Reviewed-by: Lars Knoll <[email protected]>
wangkaigithub · Oct 14, 2016 · 5c57105 · 5c57105
1 parent 9a1163c
commit 5c57105
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -926,6 +926,7 @@ ($$)
     my $pri_install_classes = "";
     my $pri_install_files = "";
     my $pri_install_pfiles = "";
+    my $pri_install_ipfiles = "";
     my $pri_install_qpafiles = "";
     my $pri_injections = "";
     my $pri_clean_files = "";
@@ -1098,6 +1099,9 @@ ($$)
                             elsif ($qpa_header) {
                                 $pri_install_qpafiles.= "$pri_install_iheader ";;
                             }
+                            elsif ($shadow) {
+                                $pri_install_ipfiles .= "$pri_install_iheader ";
+                            }
                             else {
                                 $pri_install_pfiles.= "$pri_install_iheader ";;
                             }
@@ -1242,6 +1246,7 @@ ($$)
         $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
         $headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\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_installs.prf b/mkspecs/features/qt_installs.prf
@@ -36,7 +36,7 @@ qt_install_headers {
     targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
     INSTALLS += targ_headers
 
-    private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES
+    private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
     private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private
     INSTALLS += private_headers
 

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
@@ -114,7 +114,7 @@ lib_bundle {
         FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
         FRAMEWORK_HEADERS.path = Headers
         FRAMEWORK_PRIVATE_HEADERS.version = Versions
-        FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES
+        FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES
         FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/private
         FRAMEWORK_QPA_HEADERS.version = Versions
         FRAMEWORK_QPA_HEADERS.files = $$SYNCQT.QPA_HEADER_FILES

diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
@@ -113,7 +113,7 @@ exists($$OUT_PWD/qt$${MODULE}-config.h) {
         $$fwd_rel/qt$${MODULE}-config_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/qt$${MODULE}-config_p.h
     inst_rel = $$relative_path($$OUT_PWD, $$_PRO_FILE_PWD_)
     SYNCQT.HEADER_FILES += $$inst_rel/qt$${MODULE}-config.h
-    SYNCQT.PRIVATE_HEADER_FILES += $$inst_rel/qt$${MODULE}-config_p.h
+    SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$inst_rel/qt$${MODULE}-config_p.h
 }
 
 for (injection, SYNCQT.INJECTIONS) {