let configure create the forwarding qconfig.h again

this avoids that syncqt needs to forward to a yet unexisting file (which
will have a yet unknown location, when syncqt is run at packaging time
already).

the %inject_headers syncqt config variable remains, so it can be told
not to purge "foreign" files.

Change-Id: I127ff6e0b7d5702fb0acaee9a5b7940b482d3608
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index a83f451b81..9620129509 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3351,6 +3351,37 @@ void Configure::generateConfigfiles()
         tmpFile.close();
     }
 
+    QTemporaryFile tmpFile2;
+    if (tmpFile2.open()) {
+        tmpStream.setDevice(&tmpFile2);
+        tmpStream << "#include \"../../src/corelib/global/qconfig.h\"" << endl;
+
+        tmpStream.flush();
+        tmpFile2.flush();
+
+        outName = buildPath + "/include/QtCore/qconfig.h";
+        ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
+        QFile::remove(outName);
+
+        tmpFile2.copy(outName);
+        tmpFile2.close();
+    }
+    QTemporaryFile tmpFile2a;
+    if (tmpFile2a.open()) {
+        tmpStream.setDevice(&tmpFile2a);
+        tmpStream << "#include \"qconfig.h\"" << endl;
+
+        tmpStream.flush();
+        tmpFile2a.flush();
+
+        outName = buildPath + "/include/QtCore/QtConfig";
+        ::SetFileAttributes((wchar_t*)outName.utf16(), FILE_ATTRIBUTE_NORMAL);
+        QFile::remove(outName);
+
+        tmpFile2a.copy(outName);
+        tmpFile2a.close();
+    }
+
     QTemporaryFile tmpFile3;
     if (tmpFile3.open()) {
         tmpStream.setDevice(&tmpFile3);