diff options
| author | Alexey Pavlov <alexey.pawlow@gmail.com> | 2012-11-26 19:45:02 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 21:57:49 +0100 |
| commit | 1c54dcf3bbd195884035f57bdd76b36e1173d627 (patch) | |
| tree | 459b0b6d54ab4b71d144e0feaf5f5ee2fe514404 /tools/configure/configureapp.cpp | |
| parent | 9d650a4b3623271fcdcafaa15fb71095fd0ba265 (diff) | |
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>
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0d34547a3e..7937573e05 100644 --- 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(); } |