From 13455344d7e55118733dfca6abba8662a334eba6 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 3 Feb 2014 21:19:48 +0100
Subject: move generation of qconfig.h forwarding headers to qtbase.pro

less platform-specific code. the qfeatures.h generation is already here.

Change-Id: Ied69fb431eed5816fbff63b33be431ee913c2bc8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 configure                        | 17 -----------------
 qtbase.pro                       |  8 ++++++++
 tools/configure/configureapp.cpp | 17 -----------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/configure b/configure
index 88ec0256cc..5b57f8fa55 100755
--- a/configure
+++ b/configure
@@ -6438,23 +6438,6 @@ else
     mv -f "$outpath/src/corelib/global/qconfig.h.new" "$outpath/src/corelib/global/qconfig.h"
 fi
 
-# create a forwarding header
-mkdir -p "$outpath/include/QtCore" || exit
-echo '#include "../../src/corelib/global/qconfig.h"' > $outpath/include/QtCore/qconfig.h.new
-if cmp -s "$outpath/include/QtCore/qconfig.h.new" "$outpath/include/QtCore/qconfig.h"; then
-    rm -f "$outpath/include/QtCore/qconfig.h.new"
-else
-    mv "$outpath/include/QtCore/qconfig.h.new" "$outpath/include/QtCore/qconfig.h" || exit
-fi
-
-# create a camelcase forwarding header
-echo '#include "qconfig.h"' > $outpath/include/QtCore/QtConfig.new
-if cmp -s "$outpath/include/QtCore/QtConfig.new" "$outpath/include/QtCore/QtConfig"; then
-    rm -f "$outpath/include/QtCore/QtConfig.new"
-else
-    mv "$outpath/include/QtCore/QtConfig.new" "$outpath/include/QtCore/QtConfig" || exit
-fi
-
 #-------------------------------------------------------------------------------
 # save configuration into qconfig.pri
 #-------------------------------------------------------------------------------
diff --git a/qtbase.pro b/qtbase.pro
index 1cd82bbc84..ed6fc394cb 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -177,6 +177,14 @@ FEATURES_PRI = \
     "QT_DISABLED_FEATURES = \$\$unique(QT_DISABLED_FEATURES)"
 write_file($$OUT_PWD/mkspecs/qfeatures.pri, FEATURES_PRI)|error("Aborting.")
 
+# Create forwarding headers for qconfig.h
+FWD_QCONFIG_H = \
+    '$${LITERAL_HASH}include "../../src/corelib/global/qconfig.h"'
+write_file($$OUT_PWD/include/QtCore/qconfig.h, FWD_QCONFIG_H)|error("Aborting.")
+FWD_QTCONFIG = \
+    '$${LITERAL_HASH}include "qconfig.h"'
+write_file($$OUT_PWD/include/QtCore/QtConfig, FWD_QTCONFIG)|error("Aborting.")
+
 #mkspecs
 mkspecs.path = $$[QT_HOST_DATA]/mkspecs
 mkspecs.files = \
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ac794d4c43..9995fb179e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3520,23 +3520,6 @@ void Configure::generateConfigfiles()
             dictionary[ "DONE" ] = "error";
     }
 
-    {
-        FileWriter tmpStream(buildPath + "/include/QtCore/qconfig.h");
-
-        tmpStream << "#include \"../../src/corelib/global/qconfig.h\"" << endl;
-
-        if (!tmpStream.flush())
-            dictionary[ "DONE" ] = "error";
-    }
-    {
-        FileWriter tmpStream(buildPath + "/include/QtCore/QtConfig");
-
-        tmpStream << "#include \"qconfig.h\"" << endl;
-
-        if (!tmpStream.flush())
-            dictionary[ "DONE" ] = "error";
-    }
-
     if (dictionary["EDITION"] == "Evaluation" || qmakeDefines.contains("QT_EVAL")) {
         FileWriter tmpStream(buildPath + "/src/corelib/global/qconfig_eval.cpp");
 
-- 
cgit v1.2.3