remove the configure.exe -loadconfig/-saveconfig options

these options don't seem particularly useful (they were added in 2001
without any indication of the intended usage). maintaining multiple
static configurations can be best achieved with a script (outside the
build directory, which these options didn't permit to start with).

this obsoletes QTBUG-46690, which refers to these options.

Change-Id: I994c18481cd63d256bb7a6d1948c57f7bd480614
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 2 insertions, 23 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index f0e9dde42a..18f538608e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -370,18 +370,6 @@ void Configure::parseCmdLine()
         reloadCmdLine();
     }
 
-    else if (configCmdLine.at(i) == "-loadconfig") {
-        ++i;
-        if (i != argCount) {
-            dictionary[ "REDO" ] = "yes";
-            dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i);
-            configCmdLine.clear();
-            reloadCmdLine();
-        } else {
-            dictionary[ "DONE" ] = "error";
-        }
-        i = 0;
-    }
     argCount = configCmdLine.size();
 
     bool isDeviceMkspec = false;
@@ -928,13 +916,6 @@ void Configure::parseCmdLine()
             zlibLibs = QDir::fromNativeSeparators(configCmdLine.at(i));
         }
 
-        else if (configCmdLine.at(i) == "-saveconfig") {
-            ++i;
-            if (i == argCount)
-                break;
-            dictionary[ "CUSTOMCONFIG" ] = "_" + configCmdLine.at(i);
-        }
-
         else if (configCmdLine.at(i) == "-confirm-license") {
             dictionary["LICENSE_CONFIRMED"] = "yes";
         }
@@ -1855,8 +1836,6 @@ bool Configure::displayHelp()
         desc("MSVC_MP", "no", "-no-mp",                 "Do not use multiple processors for compiling with MSVC");
         desc("MSVC_MP", "yes", "-mp",                   "Use multiple processors for compiling with MSVC (-MP).\n");
 
-        desc(                   "-loadconfig <config>", "Run configure with the parameters from file configure_<config>.cache.");
-        desc(                   "-saveconfig <config>", "Run configure and save the parameters in file configure_<config>.cache.");
         desc(                   "-redo",                "Run configure with the same parameters as last time.\n");
         desc(                   "-v, -verbose",         "Run configure tests with verbose output.\n");
         return true;
@@ -4246,7 +4225,7 @@ void Configure::readLicense()
 void Configure::reloadCmdLine()
 {
     if (dictionary[ "REDO" ] == "yes") {
-        QFile inFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache");
+        QFile inFile(buildPath + "/configure.cache");
         if (inFile.open(QFile::ReadOnly)) {
             QTextStream inStream(&inFile);
             while (!inStream.atEnd())
@@ -4259,7 +4238,7 @@ void Configure::reloadCmdLine()
 void Configure::saveCmdLine()
 {
     if (dictionary[ "REDO" ] != "yes") {
-        QFile outFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache");
+        QFile outFile(buildPath + "/configure.cache");
         if (outFile.open(QFile::WriteOnly | QFile::Text)) {
             QTextStream outStream(&outFile);
             for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) {