diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-04-19 17:12:15 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-04-25 10:28:22 +0000 |
| commit | 967bb3f0d8d8c65bd1e09011d9daac21ab51b585 (patch) | |
| tree | 5f965860b3087eabbbcab63b23719c99f1d3b081 /bin | |
| parent | 8c57663ed21855ad6b888bd01785b7f4e9251ae6 (diff) | |
| download | qtbase-967bb3f0d8d8c65bd1e09011d9daac21ab51b585.tar.gz | |
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>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 13 |
1 files changed, 2 insertions, 11 deletions
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"; |