summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-07-17 03:50:58 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-07-17 03:50:58 (GMT)
commit7702be3de6e2641afb1062f533567ca7a72e8e0f (patch)
treee1ceb2bc9ff614b90eed92e17c606fe872a68304 /bin
parent98dad6147ed9f3edc4dd47fe21c629354f2f39ab (diff)
downloadQt-7702be3de6e2641afb1062f533567ca7a72e8e0f.zip
Qt-7702be3de6e2641afb1062f533567ca7a72e8e0f.tar.gz
Qt-7702be3de6e2641afb1062f533567ca7a72e8e0f.tar.bz2
Revert "fix qconfig.h aliased header creation"
This reverts commit 74564a9b9f0f4e4ead8c3e38f72c24054b65f62a, which breaks configure for Windows CE builds.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt2
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt
index cb67cc6..11b1d72 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -691,7 +691,6 @@ 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
@@ -801,7 +800,6 @@ 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/);