summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-04 16:06:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-04 16:06:40 (GMT)
commit4cfd1f19fdcd1e61aa50feed5eb8228afff94e66 (patch)
tree159a2f90ff7bb016fd166f1b18826aed2a460ac5 /bin
parent953ff11a1b424dd288b6504c5a6f918acaebaa60 (diff)
parent1a7a1172d048108c30a9890ce9477686711ad756 (diff)
downloadQt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.zip
Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.gz
Qt-4cfd1f19fdcd1e61aa50feed5eb8228afff94e66.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt14
1 files changed, 8 insertions, 6 deletions
diff --git a/bin/syncqt b/bin/syncqt
index faa3575..99562fb 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -694,10 +694,7 @@ my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dis
my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" );
my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
my %colliding_headers = ();
-my %inject_headers;
-# Force generation of forwarding header for qconfig.h if (and only if) we can't
-# find the header by normal means.
-%inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h");
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
foreach my $lib (@modules_to_sync) {
#iteration info
@@ -799,7 +796,12 @@ foreach my $lib (@modules_to_sync) {
#calc files and "copy" them
foreach my $subdir (@subdirs) {
my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
- push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
+ if (defined $inject_headers{$subdir}) {
+ foreach my $if ($inject_headers{$subdir}) {
+ @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously
+ push @headers, "*".$if;
+ }
+ }
foreach my $header (@headers) {
my $shadow = ($header =~ s/^\*//);
$header = 0 if($header =~ /^ui_.*.h/);
@@ -877,7 +879,7 @@ foreach my $lib (@modules_to_sync) {
@headers = ( "$out_basedir/include/$lib/private/$header" );
}
foreach(@headers) { #sync them
- $header_copies++ if(syncHeader($_, $iheader, $copy_headers, $ts));
+ $header_copies++ if(syncHeader($_, $iheader, $copy_headers && !$shadow, $ts));
}
if($public_header) {