From 967bb3f0d8d8c65bd1e09011d9daac21ab51b585 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 19 Apr 2018 17:12:15 +0200
Subject: syncqt: don't write INJECTED_*HEADERS

these are actually redundant with INJECTIONS.

Change-Id: I0a71930401e00d30c9898b4d958de5e89c496d18
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 bin/syncqt.pl | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'bin')

diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index c6aced4412..3616db6f4b 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -922,9 +922,7 @@ foreach my $lib (@modules_to_sync) {
     #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 @@ foreach my $lib (@modules_to_sync) {
                                     $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 @@ foreach my $lib (@modules_to_sync) {
                             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 @@ foreach my $lib (@modules_to_sync) {
         #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";
-- 
cgit v1.2.3


From e46f9d68d8a8cc75c011fb304f064b927a784d56 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 19 Apr 2018 18:19:13 +0200
Subject: syncqt: fix CamelCase aliases for injected headers

don't put them into GENERATED_HEADER_FILES, as they obviously cannot be
found in a pre-synced source dir. instead, let the injection code itself
add them to INJECTED_HEADER_FILES.

Task-number: QTBUG-67813
Change-Id: Id2a7c565b14fcba8aba9d1dd8b1dd39c586d0d91
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 bin/syncqt.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index 3616db6f4b..f202599fe0 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -1086,7 +1086,7 @@ foreach my $lib (@modules_to_sync) {
 #                                   }
                                     my $class_header = "$class ";
                                     $pri_install_gfiles .= $class_header
-                                                                unless($pri_install_gfiles =~ $class_header);
+                                        unless ($shadow || $pri_install_gfiles =~ $class_header);
                                     $injection .= ":$class";
                                 }
 
-- 
cgit v1.2.3