configure.exe: Show error on "-target xp" option

The option was removed in dev but should have been removed in 5.7. In
order not to complicate merges most of the code that was removed in dev
has been kept as is and only the "bare minimum" was removed.

Task-number: QTBUG-54674
Change-Id: I5118fe344de014bdcf008cccfe9eca112896d23a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bc519663e8..a89e66c377 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -526,6 +526,12 @@ void Configure::parseCmdLine()
             if (i == argCount)
                 break;
             const QString option = configCmdLine.at(i);
+            if (option == "xp") {
+                cout << "ERROR: option \"-target xp\" is no longer valid" << endl;
+                dictionary["DONE"] = "error";
+                return;
+            }
+
             if (option != "xp") {
                 cout << "ERROR: invalid argument for -target option" << endl;
                 dictionary["DONE"] = "error";
@@ -1817,9 +1823,6 @@ bool Configure::displayHelp()
         desc(                   "-xplatform <spec>",    "The operating system and compiler you are cross compiling to.\n");
         desc(                   "",                     "See the README file for a list of supported operating systems and compilers.\n", false, ' ');
 
-        desc("TARGET_OS", "*", "-target",               "Set target OS version. Currently the only valid value is 'xp' for targeting Windows XP.\n"
-                                                        "MSVC >= 2012 targets Windows Vista by default.\n");
-
         desc(                   "-sysroot <dir>",       "Sets <dir> as the target compiler's and qmake's sysroot and also sets pkg-config paths.");
         desc(                   "-no-gcc-sysroot",      "When using -sysroot, it disables the passing of --sysroot to the compiler.\n");