AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename the -redo status file to config.opt

Browse Source 
configure.cache is really kinda misleading.

the old name is still recognized for backwards compat.

Change-Id: I5ca461e99a0f9336ad70adfa5b8f6bb81ad73bbb
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-06 12:56:02 +02:00
parent 2d83e28f08
commit 2b31f47098
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -116,6 +116,7 @@ bin/qt.conf
bin/servicefw* bin/servicefw*
bin/sfwlisten* bin/sfwlisten*
configure.cache configure.cache
config.opt
config.status config.status
config.summary config.summary
config.log config.log

16
tools/configure/configureapp.cpp
View File

@ -4240,20 +4240,22 @@ void Configure::readLicense()
void Configure::reloadCmdLine(int idx) void Configure::reloadCmdLine(int idx)
{ {
if (dictionary[ "REDO" ] == "yes") { if (dictionary[ "REDO" ] == "yes") {
QFile inFile(buildPath + "/configure.cache"); QFile inFile(buildPath + "/config.opt");
if (inFile.open(QFile::ReadOnly)) { if (!inFile.open(QFile::ReadOnly)) {
QTextStream inStream(&inFile); inFile.setFileName(buildPath + "/configure.cache");
while (!inStream.atEnd()) if (!inFile.open(QFile::ReadOnly))
configCmdLine.insert(idx++, inStream.readLine().trimmed()); return;
inFile.close();
} }
QTextStream inStream(&inFile);
while (!inStream.atEnd())
configCmdLine.insert(idx++, inStream.readLine().trimmed());
} }
} }
void Configure::saveCmdLine() void Configure::saveCmdLine()
{ {
if (dictionary[ "REDO" ] != "yes") { if (dictionary[ "REDO" ] != "yes") {
QFile outFile(buildPath + "/configure.cache"); QFile outFile(buildPath + "/config.opt");
if (outFile.open(QFile::WriteOnly | QFile::Text)) { if (outFile.open(QFile::WriteOnly | QFile::Text)) {
QTextStream outStream(&outFile); QTextStream outStream(&outFile);
for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) { for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) {