diff options
Diffstat (limited to 'bin/syncqt')
| -rwxr-xr-x | bin/syncqt | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/bin/syncqt b/bin/syncqt index bc2ccf38ae..6138a1cbc8 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -860,6 +860,7 @@ foreach my $lib (@modules_to_sync) { my $pri_install_classes = ""; my $pri_install_files = ""; my $pri_install_pfiles = ""; + my $pri_install_qpafiles = ""; my $libcapitals = $lib; $libcapitals =~ y/a-z/A-Z/; @@ -992,7 +993,11 @@ foreach my $lib (@modules_to_sync) { my $header_copies = 0; #figure out if it is a public header my $public_header = $header; - if($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { + my $qpa_header = 0; + if($public_header =~ /^qplatform/) { + $public_header = 0; + $qpa_header = 1; + } elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; } else { foreach (@ignore_for_master_contents) { @@ -1040,13 +1045,20 @@ foreach my $lib (@modules_to_sync) { $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$explicitheaders{$lib}{basename($header)}", "$out_basedir/include/$lib/$header", 0, $ts)); } - } elsif ($create_private_headers) { + } elsif ($create_private_headers && !$qpa_header) { if ($module_version) { @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" ); } else { @headers = ( "$out_basedir/include/$lib/private/$header" ); } + } elsif ($create_private_headers) { + if ($module_version) { + @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" ); + } else { + @headers = ( "$out_basedir/include/$lib/qpa/$header" ); + } } + foreach(@headers) { #sync them $header_copies++ if(syncHeader($lib, $_, $iheader, $copy_headers && !$shadow, $ts)); } @@ -1076,6 +1088,10 @@ foreach my $lib (@modules_to_sync) { $pri_install_files.= "$pri_install_iheader ";; } } + elsif ($qpa_header) { + my $pri_install_iheader = fixPaths($iheader, $current_dir); + $pri_install_qpafiles.= "$pri_install_iheader ";; + } else { my $pri_install_iheader = fixPaths($iheader, $current_dir); $pri_install_pfiles.= "$pri_install_iheader ";; @@ -1163,15 +1179,15 @@ foreach my $lib (@modules_to_sync) { } else { print "$lib: created deprecated header $header => $include\n"; } - - my $addendum = fixPaths($header_path, $dir) . " "; - if ($public_header) { - $pri_install_files .= $addendum; - } else { - $pri_install_pfiles .= $addendum; - } $first = 0; } + + my $addendum = fixPaths($header_path, $dir) . " "; + if ($public_header) { + $pri_install_files .= $addendum; + } else { + $pri_install_pfiles .= $addendum; + } } if ($verbose_level < 3) { print " }\n" unless ($first); @@ -1208,6 +1224,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.QPA_HEADER_FILES = $pri_install_qpafiles\n"; my $headers_pri_file = "$out_basedir/include/$lib/headers.pri"; if(-e $headers_pri_file) { open HEADERS_PRI_FILE, "<$headers_pri_file"; @@ -1317,6 +1334,8 @@ if($check_includes) { my $public_header = $header; if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; + } elsif ($public_header =~ /^qplatform/) { + $public_header = 0; } else { foreach (@ignore_for_master_contents) { $public_header = 0 if($header eq $_); |