summaryrefslogtreecommitdiffstats
path: root/bin/syncqt
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-14 14:26:19 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-07-14 15:23:54 (GMT)
commit00b7befbc003682a351c18d90436010efd26ece5 (patch)
treee6a226c8b4a7c9e24af6d19d50077f5652af2584 /bin/syncqt
parent247e3637c41cc14d174a1170957274fb8a9400b4 (diff)
downloadQt-00b7befbc003682a351c18d90436010efd26ece5.zip
Qt-00b7befbc003682a351c18d90436010efd26ece5.tar.gz
Qt-00b7befbc003682a351c18d90436010efd26ece5.tar.bz2
fix qconfig.h reference for shadow builds
Reviewed-by: joerg
Diffstat (limited to 'bin/syncqt')
-rwxr-xr-xbin/syncqt4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/syncqt b/bin/syncqt
index fb5c8d8..03659d3 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -691,7 +691,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" );
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 = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) );
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) );
foreach (@modules_to_sync) {
#iteration info
@@ -804,6 +804,7 @@ foreach (@modules_to_sync) {
push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
foreach (@headers) {
my $header = "$_";
+ my $shadow = ($header =~ s/^\*//);
$header = 0 if("$header" =~ /^ui_.*.h/);
foreach (@ignore_headers) {
$header = 0 if("$header" eq "$_");
@@ -821,6 +822,7 @@ foreach (@modules_to_sync) {
}
my $iheader = $subdir . "/" . $header;
+ $iheader =~ s/^\Q$basedir\E/$out_basedir/ if ($shadow);
my @classes = $public_header ? classNames($iheader) : ();
if($showonly) {
print "$header [$lib]\n";