1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Alexey Pavlov 2012-11-26 19:45:02 +04:00 committed by The Qt Project
parent 9d650a4b36
commit 1c54dcf3bb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/configure/configureapp.cpp
View File

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