diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-14 11:55:27 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-07-14 12:49:27 +0200 |
commit | 74d0482c1690211a20bdfc996aa0ad30fdb9bb28 (patch) | |
tree | 21fea8832b16c2a0cfab6f694908ba6a99057631 /bin | |
parent | b7f55ac9c1c6b87083c9dca3b5cbca211fdecaef (diff) | |
download | qt4-tools-74d0482c1690211a20bdfc996aa0ad30fdb9bb28.tar.gz |
fix qconfig.h aliased header creation
don't have configure create the forwarding headers (or symlinks on unix)
for qconfig.h, but instead have syncqt create forwarding headers for
not yet existing files.
Reviewed-by: joerg
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/syncqt b/bin/syncqt index c8cba30b48..fb5c8d8c7b 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -691,6 +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" ) ); foreach (@modules_to_sync) { #iteration info @@ -800,6 +801,7 @@ foreach (@modules_to_sync) { foreach (@subdirs) { my $subdir = "$_"; my @headers = findFiles("$subdir", "^[-a-z0-9_]*\\.h\$" , 0); + push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir}); foreach (@headers) { my $header = "$_"; $header = 0 if("$header" =~ /^ui_.*.h/); |