diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-29 14:05:27 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-05 15:49:07 +0000 |
| commit | 9a1af81ae12f1c642bdbb2aa6eb4ef7989590cdd (patch) | |
| tree | 27f807c1dd3ae5943131895048514b8df342a1a3 | |
| parent | 0e1efdf549a1b036c58e752f92df5369152bff75 (diff) | |
Remove unused command line options
-embedded is dead since 187ea846a6, and -arch is obsolete since ba6952b28
(both 2012).
Change-Id: Ife107c4f2ea26f62ce675544b7ad5c06630f5631
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | tools/configure/configureapp.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 089733ad35..5b62657d2a 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -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; |