From 7702be3de6e2641afb1062f533567ca7a72e8e0f Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Sat, 17 Jul 2010 13:50:58 +1000
Subject: Revert "fix qconfig.h aliased header creation"

This reverts commit 74564a9b9f0f4e4ead8c3e38f72c24054b65f62a, which
breaks configure for Windows CE builds.
---
 bin/syncqt                       |  2 --
 configure                        |  5 +++++
 tools/configure/configureapp.cpp | 10 ++++++++++
 3 files changed, 15 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/);
diff --git a/configure b/configure
index 62e0863..166f201 100755
--- a/configure
+++ b/configure
@@ -4481,6 +4481,11 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     fi
 
     mv -f "$QMAKE_QCONFIG_H" "$QCONFIG_H"
+    for conf in "$outpath/include/QtCore/qconfig.h" "$outpath/include/Qt/qconfig.h"; do
+        if [ '!' -f "$conf" ]; then
+            ln -s "$QCONFIG_H" "$conf"
+        fi
+    done
 
     #mkspecs/default is used as a (gasp!) default mkspec so QMAKESPEC needn't be set once configured
     rm -f mkspecs/default
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7f2d53b..d3dec3c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3164,6 +3164,16 @@ void Configure::generateConfigfiles()
         QFile::remove(outName);
         tmpFile.copy(outName);
         tmpFile.close();
+
+        if (!QFile::exists(buildPath + "/include/QtCore/qconfig.h")) {
+            if (!writeToFile("#include \"../../src/corelib/global/qconfig.h\"\n",
+                             buildPath + "/include/QtCore/qconfig.h")
+            || !writeToFile("#include \"../../src/corelib/global/qconfig.h\"\n",
+                            buildPath + "/include/Qt/qconfig.h")) {
+                dictionary["DONE"] = "error";
+                return;
+            }
+        }
     }
 
     // Copy configured mkspec to default directory, but remove the old one first, if there is any
-- 
cgit v0.12