1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Oliver Wolff 2016-07-11 15:25:02 +02:00
parent 7cfdbe5102
commit 49f9328175
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/configure/configureapp.cpp
View File

@ -526,6 +526,12 @@ void Configure::parseCmdLine()
if (i == argCount) if (i == argCount)
break; break;
const QString option = configCmdLine.at(i); 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") { if (option != "xp") {
cout << "ERROR: invalid argument for -target option" << endl; cout << "ERROR: invalid argument for -target option" << endl;
dictionary["DONE"] = "error"; 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( "-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( "", "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( "-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"); desc( "-no-gcc-sysroot", "When using -sysroot, it disables the passing of --sysroot to the compiler.\n");