Merge remote-tracking branch 'origin/5.11.0' into 5.11

Change-Id: Id6e2acd5e31c1ac858ddf1d8873a6f10694141de
cryptobuks · May 9, 2018 · 552c45b · 552c45b
2 parents e110ab6 + a7863a5
commit 552c45b
Show file tree

Hide file tree

Showing 10 changed files with 617 additions and 39 deletions.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -921,9 +921,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 = "";
@@ -1083,13 +1081,11 @@ ($$)
 #                                   }
                                     my $class_header = "$class ";
                                     $pri_install_gfiles .= $class_header
-                                                                unless($pri_install_gfiles =~ $class_header);
+                                        unless ($shadow || $pri_install_gfiles =~ $class_header);
                                     $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));
 
@@ -1101,10 +1097,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")
@@ -1227,10 +1220,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";