Merge remote-tracking branch 'origin/5.10.0' into 5.10

Change-Id: I6dcf85067ec226136c207ea69ca9d66736c84db5
zhangzhuo520 · Dec 8, 2017 · 812bb23 · 812bb23
2 parents 79d78d8 + 50117d7
commit 812bb23
Show file tree

Hide file tree

Showing 59 changed files with 897 additions and 203 deletions.
diff --git a/bin/syncqt.pl b/bin/syncqt.pl
@@ -1037,7 +1037,8 @@ ($$)
 
                         my $clean_header;
                         my $requires;
-                        my $iheader = $subdir . "/" . $header;
+                        my $iheader_src = $subdir . "/" . $header;
+                        my $iheader = $iheader_src;
                         $iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow);
                         if ($check_includes) {
                             # We need both $public_header and $private_header because QPA headers count as neither
@@ -1079,7 +1080,7 @@ ($$)
                             }
                             $header_copies++ if (!$shadow && syncHeader($lib, $oheader, $iheader, $copy_headers, $ts));
 
-                            my $pri_install_iheader = fixPaths($iheader, $dir);
+                            my $pri_install_iheader = fixPaths($iheader_src, $dir);
                             my $injection = "";
                             if ($public_header) {
                                 foreach my $class (@classes) {