diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:48:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:48:42 +0200 |
| commit | 552c45bea924279a0a7c2d78c9d7e2959deee11f (patch) | |
| tree | ee4326efe97420b1cda12118fd6309b4b6668c75 /bin | |
| parent | e110ab6c282790f6f035d52747b8589c448a362b (diff) | |
| parent | a7863a58545a6c59eaf16f36905efcbf0e4f94f9 (diff) | |
| download | qtbase-552c45bea924279a0a7c2d78c9d7e2959deee11f.tar.gz | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Id6e2acd5e31c1ac858ddf1d8873a6f10694141de
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 9a889c062b..78fe0663b5 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -921,9 +921,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 = ""; @@ -1083,13 +1081,11 @@ 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"; } - 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 @@ 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") @@ -1227,10 +1220,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"; |