From 1c54dcf3bbd195884035f57bdd76b36e1173d627 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 26 Nov 2012 19:45:02 +0400 Subject: 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 --- tools/configure/configureapp.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tools') 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(); } -- cgit v1.2.3