diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
2 files changed, 10 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 52b064109f..d583ffa12e 100644 --- a/.gitignore +++ b/.gitignore @@ -116,6 +116,7 @@ bin/qt.conf bin/servicefw* bin/sfwlisten* configure.cache +config.opt config.status config.summary config.log diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d8c27af884..ccfc067c43 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -4240,20 +4240,22 @@ void Configure::readLicense() void Configure::reloadCmdLine(int idx) { if (dictionary[ "REDO" ] == "yes") { - QFile inFile(buildPath + "/configure.cache"); - if (inFile.open(QFile::ReadOnly)) { - QTextStream inStream(&inFile); - while (!inStream.atEnd()) - configCmdLine.insert(idx++, inStream.readLine().trimmed()); - inFile.close(); + QFile inFile(buildPath + "/config.opt"); + if (!inFile.open(QFile::ReadOnly)) { + inFile.setFileName(buildPath + "/configure.cache"); + if (!inFile.open(QFile::ReadOnly)) + return; } + QTextStream inStream(&inFile); + while (!inStream.atEnd()) + configCmdLine.insert(idx++, inStream.readLine().trimmed()); } } void Configure::saveCmdLine() { if (dictionary[ "REDO" ] != "yes") { - QFile outFile(buildPath + "/configure.cache"); + QFile outFile(buildPath + "/config.opt"); if (outFile.open(QFile::WriteOnly | QFile::Text)) { QTextStream outStream(&outFile); for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) { |