AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused command line options

Browse Source 
-embedded is dead since 187ea846a6, and -arch is obsolete since ba6952b28
(both 2012).

Change-Id: Ife107c4f2ea26f62ce675544b7ad5c06630f5631
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Lars Knoll 2016-06-29 14:05:27 +02:00
parent 0e1efdf549
commit 9a1af81ae1
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/configure/configureapp.cpp
View File

@ -137,7 +137,6 @@ Configure::Configure(int& argc, char** argv) : verbose(0)
dictionary[ "QMAKESPEC_FROM" ] = "env";
}
dictionary[ "EMBEDDED" ] = "no";
dictionary[ "BUILD_QMAKE" ] = "yes";
dictionary[ "QMAKE_INTERNAL" ] = "no";
dictionary[ "WIDGETS" ] = "yes";
@ -517,13 +516,6 @@ void Configure::parseCmdLine()
break;
dictionary[ "QMAKESPEC" ] = configCmdLine.at(i);
dictionary[ "QMAKESPEC_FROM" ] = "commandline";
} else if (configCmdLine.at(i) == "-arch") {
++i;
if (i == argCount)
break;
dictionary["OBSOLETE_ARCH_ARG"] = "yes";
} else if (configCmdLine.at(i) == "-embedded") {
dictionary[ "EMBEDDED" ] = "yes";
} else if (configCmdLine.at(i) == "-xplatform"
|| configCmdLine.at(i) == "-device") {
++i;
@ -3693,16 +3685,6 @@ void Configure::displayConfig()
sout << " configure -openssl-linked OPENSSL_LIBS=\"-lssleay32 -llibeay32\"" << endl;
}
}
if (dictionary["OBSOLETE_ARCH_ARG"] == "yes") {
sout << endl
<< "NOTE: The -arch option is obsolete." << endl
<< endl
<< "Qt now detects the target and host architectures based on compiler" << endl
<< "output. Qt will be built using " << dictionary["QT_ARCH"] << " for the target architecture" << endl
<< "and " << dictionary["QT_HOST_ARCH"] << " for the host architecture (note that these two" << endl
<< "will be the same unless you are cross-compiling)." << endl
<< endl;
}
if (dictionary["RELEASE_TOOLS"] == "yes" && dictionary["BUILD"] != "debug" ) {
sout << endl
<< "NOTE: -optimized-tools is not useful in -release mode." << endl;