diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:17 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-30 11:51:20 +0200 |
commit | 42f2da5e6b543e698fc4f036c45ebb15078409c8 (patch) | |
tree | 2d688b1a812d8410d4ae85283d5e413957000e11 /bin | |
parent | e9962cc300a805ce09a02ce0c9ae23ceaf8073bb (diff) | |
parent | 009f3d14045e2e2a6eff8c87a8da9eaa621c5249 (diff) |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/src.pro
Change-Id: Ic04fb170b82e86dc3cef6fe979f8fb709db10daf
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt index 4eab929b30..f28b2bf60a 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -33,7 +33,7 @@ $qtbasedir = dirname(dirname($0)) if (!$qtbasedir); $qtbasedir =~ s=\\=/=g if (defined $qtbasedir); # will be defined based on the modules sync.profile -our (%modules, %moduleheaders, %classnames, %mastercontent, %modulepris); +our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %mastercontent, %modulepris); # global variables (modified by options) my $isunix = 0; @@ -792,6 +792,8 @@ loadSyncProfile(\$basedir, \$out_basedir); @modules_to_sync = keys(%modules) if($#modules_to_sync == -1); +my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate; + $isunix = checkUnix; #cache checkUnix # create path @@ -828,6 +830,9 @@ foreach my $lib (@modules_to_sync) { my $pathtoheaders = ""; $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib}); + my $allheadersprivate = 0; + $allheadersprivate = 1 if $allmoduleheadersprivate{$lib}; + #information used after the syncing my $pri_install_classes = ""; my $pri_install_files = ""; @@ -955,7 +960,7 @@ foreach my $lib (@modules_to_sync) { my $header_copies = 0; #figure out if it is a public header my $public_header = $header; - if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { + if($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; } else { foreach (@ignore_for_master_contents) { |