Moving the remaining variables assignments from .qmake.cache to qmodule.pri

Moving variables to qmodule.pri allows to build all qt modules with user defined
command line arguments passed to configure script.

Task-number: QTBUG-27566

Change-Id: Ifa7991e9024df3fb4b1fd6536ee0d19b7c63d15e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0d34547..7937573 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2771,9 +2771,7 @@ void Configure::generateCachefile()
     if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
         QTextStream cacheStream(&cacheFile);
 
-        for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var) {
-            cacheStream << (*var) << endl;
-        }
+        // nothing left here
 
         cacheStream.flush();
         cacheFile.close();
@@ -2838,6 +2836,9 @@ void Configure::generateCachefile()
             moduleStream << " nostrip";
         moduleStream << endl;
 
+        for (QStringList::Iterator var = qmakeVars.begin(); var != qmakeVars.end(); ++var)
+            moduleStream << (*var) << endl;
+
         moduleStream.flush();
         moduleFile.close();
     }