From df9aee21504b18decbd5637ca4ce86c559fa3cc3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 29 Jun 2016 15:02:58 +0200 Subject: Fix URL to ANGLE Point to the README.md of the project; the old URL http://code.google.com/p/angleproject is now redirected to the bugtracker. Change-Id: I293fc150d5b6c08f16effe8921010050faa264b5 Reviewed-by: Maurice Kalinowski --- tools/configure/configureapp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/configure/configureapp.cpp') diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 0909ff8aab..f2b54f57f2 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2009,7 +2009,7 @@ bool Configure::displayHelp() } desc("ANGLE", "yes", "-angle", "Use the ANGLE implementation of OpenGL ES 2.0."); - desc("ANGLE", "no", "-no-angle", "Do not use ANGLE.\nSee http://code.google.com/p/angleproject/\n"); + desc("ANGLE", "no", "-no-angle", "Do not use ANGLE.\nSee https://chromium.googlesource.com/angle/angle/+/master/README.md\n"); // Qt\Windows only options go below here -------------------------------------------------------------------------------- desc("\nQt for Windows only:\n\n"); -- cgit v1.2.3 From 49f9328175fe42d00c6e15a8599b1a912bb9863d Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 11 Jul 2016 15:25:02 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools/configure/configureapp.cpp') 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 ", "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 ", "Sets 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"); -- cgit v1.2.3