Remove the -version-override command line arguments in configure.exe

Those are not supported on Unix configure and are not something
we should support IMO.

Also cleaned up setting a QMAKE_QT_VERSION_OVERRIDE variable
in qconfig.pri that's never used.

Change-Id: I470483660118368abf7bd8aba4a53a25d9ab8a40
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 0 insertions, 15 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index f3892254a5..545b207939 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -928,13 +928,6 @@ void Configure::parseCmdLine()
             zlibLibs = QDir::fromNativeSeparators(configCmdLine.at(i));
         }
 
-        else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
-            ++i;
-            if (i == argCount)
-                break;
-            dictionary[ "VERSION" ] = configCmdLine.at(i);
-        }
-
         else if (configCmdLine.at(i) == "-saveconfig") {
             ++i;
             if (i == argCount)
@@ -2666,14 +2659,6 @@ void Configure::generateOutputVars()
     if (dictionary["MSVC_MP"] == "yes")
         qmakeConfig += "msvc_mp";
 
-    if (dictionary[ "SHARED" ] == "yes") {
-        QString version = dictionary[ "VERSION" ];
-        if (!version.isEmpty()) {
-            qmakeVars += "QMAKE_QT_VERSION_OVERRIDE = " + version.left(version.indexOf('.'));
-            version.remove(QLatin1Char('.'));
-        }
-    }
-
     if (dictionary["ATOMIC64"] == "libatomic")
         qmakeConfig += "atomic64-libatomic";