diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-10 19:29:54 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-14 09:00:29 +0000 |
| commit | 5c571055651b92315632b5a6ff8da6f9bddeea2a (patch) | |
| tree | 2282237c433ca75399b0d6700a728d145ab8fe39 /bin | |
| parent | 9a1163c7aef3aec360d7a3bf95861ee61f5888f2 (diff) | |
don't include injected headers into linker version script
it makes no sense to version them, as they contain only #defines anyway.
it also removes the need to special-case their location in shadow builds
with pre-synced headers, which we actually failed to do anyway.
Task-number: QTBUG-56286
Change-Id: I4ea717f7be56494cfea0572389bea173d7470b6e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt.pl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 9f5553281b..372aa2b331 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -926,6 +926,7 @@ foreach my $lib (@modules_to_sync) { my $pri_install_classes = ""; my $pri_install_files = ""; my $pri_install_pfiles = ""; + my $pri_install_ipfiles = ""; my $pri_install_qpafiles = ""; my $pri_injections = ""; my $pri_clean_files = ""; @@ -1098,6 +1099,9 @@ foreach my $lib (@modules_to_sync) { elsif ($qpa_header) { $pri_install_qpafiles.= "$pri_install_iheader ";; } + elsif ($shadow) { + $pri_install_ipfiles .= "$pri_install_iheader "; + } else { $pri_install_pfiles.= "$pri_install_iheader ";; } @@ -1242,6 +1246,7 @@ foreach my $lib (@modules_to_sync) { $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; $headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\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"; |