rename the -redo status file to config.opt

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>

1 files changed, 9 insertions, 7 deletions

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) {