From 0e1efdf549a1b036c58e752f92df5369152bff75 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 27 Jun 2016 16:21:25 +0200 Subject: Remove the -target command line option This was only used to specify XP as a target which is not supported on 5.8 anymore. Clean up all associated special handling in the mkspecs and pro files. This effectively reverts change 10a0ac75. Change-Id: I420d73002912989f1a5be961a2d09277ec4a4425 Reviewed-by: Oswald Buddenhagen --- mkspecs/common/msvc-base.conf | 2 -- mkspecs/features/win32/console.prf | 2 +- mkspecs/features/win32/qt_config.prf | 10 ---------- mkspecs/features/win32/windows.prf | 2 +- qmake/generators/win32/msvc_vcproj.cpp | 2 -- src/angle/src/config.pri | 2 -- tools/configure/configureapp.cpp | 27 --------------------------- 7 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 mkspecs/features/win32/qt_config.prf diff --git a/mkspecs/common/msvc-base.conf b/mkspecs/common/msvc-base.conf index 5bd144faa0..1651cf5ded 100644 --- a/mkspecs/common/msvc-base.conf +++ b/mkspecs/common/msvc-base.conf @@ -27,8 +27,6 @@ greaterThan(MSC_VER, 1599) { greaterThan(MSC_VER, 1699) { # Visual Studio 2012 (11.0) / Visual C++ 17.0 and up QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -D_HAS_EXCEPTIONS=0 - QMAKE_LFLAGS_CONSOLE = /SUBSYSTEM:CONSOLE@QMAKE_SUBSYSTEM_SUFFIX@ - QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS@QMAKE_SUBSYSTEM_SUFFIX@ QT_CONFIG += c++11 CONFIG += c++11 } diff --git a/mkspecs/features/win32/console.prf b/mkspecs/features/win32/console.prf index e04367e20b..739bb0e01b 100644 --- a/mkspecs/features/win32/console.prf +++ b/mkspecs/features/win32/console.prf @@ -1,5 +1,5 @@ CONFIG -= windows -QMAKE_LFLAGS += $$replace(QMAKE_LFLAGS_CONSOLE, @QMAKE_SUBSYSTEM_SUFFIX@, $$QMAKE_SUBSYSTEM_SUFFIX) +QMAKE_LFLAGS += $$QMAKE_LFLAGS_CONSOLE contains(TEMPLATE, ".*app") { QMAKE_LFLAGS += $$QMAKE_LFLAGS_EXE } diff --git a/mkspecs/features/win32/qt_config.prf b/mkspecs/features/win32/qt_config.prf deleted file mode 100644 index 49b4c79431..0000000000 --- a/mkspecs/features/win32/qt_config.prf +++ /dev/null @@ -1,10 +0,0 @@ -load(qt_config) - -equals(QMAKE_TARGET_OS, xp) { - # http://blogs.msdn.com/b/vcblog/archive/2012/10/08/10357555.aspx?PageIndex=3 - equals(QT_ARCH, x86_64) { - QMAKE_SUBSYSTEM_SUFFIX = ,5.02 - } else { - QMAKE_SUBSYSTEM_SUFFIX = ,5.01 - } -} diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 986067fc8c..ecb167bf18 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -1,5 +1,5 @@ CONFIG -= console -QMAKE_LFLAGS += $$replace(QMAKE_LFLAGS_WINDOWS, @QMAKE_SUBSYSTEM_SUFFIX@, $$QMAKE_SUBSYSTEM_SUFFIX) +QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS contains(TEMPLATE, ".*app") { QMAKE_LFLAGS += $$QMAKE_LFLAGS_EXE mingw:DEFINES += QT_NEEDS_QMAIN diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index ee8a31cb1c..7e476eaf42 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -378,8 +378,6 @@ QString VcprojGenerator::retrievePlatformToolSet() const QString suffix; if (project->isActiveConfig("winphone")) suffix = '_' + project->first("WINTARGET_VER").toQString().toLower(); - else if (project->first("QMAKE_TARGET_OS") == "xp") - suffix = "_xp"; switch (vcProject.Configuration.CompilerVersion) { diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 2c5b5ec615..4beb095217 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -40,8 +40,6 @@ DEFINES += _WINDOWS \ CONFIG += angle_d3d11 # Remove to disable D3D11 renderer -equals(QMAKE_TARGET_OS, xp): CONFIG -= angle_d3d11 - angle_d3d11 { DEFINES += ANGLE_ENABLE_D3D11 ANGLE_DEFAULT_D3D11=1 !build_pass: message("Enabling D3D11 mode for ANGLE") diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 7b03055fff..089733ad35 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -511,18 +511,6 @@ void Configure::parseCmdLine() else if (configCmdLine.at(i) == "-force-asserts") { dictionary[ "FORCE_ASSERTS" ] = "yes"; } - else if (configCmdLine.at(i) == "-target") { - ++i; - if (i == argCount) - break; - const QString option = configCmdLine.at(i); - if (option != "xp") { - cout << "ERROR: invalid argument for -target option" << endl; - dictionary["DONE"] = "error"; - return; - } - dictionary["TARGET_OS"] = option; - } else if (configCmdLine.at(i) == "-platform") { ++i; if (i == argCount) @@ -1718,9 +1706,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"); @@ -2454,12 +2439,6 @@ bool Configure::verifyConfiguration() << "files such as headers and libraries." << endl; prompt = true; } -#if WINVER > 0x0601 - if (dictionary["TARGET_OS"] == "xp") { - cout << "WARNING: Cannot use Windows Kit 8 to build Qt for Windows XP.\n" - "WARNING: Windows SDK v7.1A is recommended.\n"; - } -#endif if (dictionary["DIRECT2D"] == "yes" && !checkAvailability("DIRECT2D")) { cout << "WARNING: To be able to build the Direct2D platform plugin you will" << endl @@ -3325,10 +3304,6 @@ void Configure::generateQConfigPri() << "}" << endl; } - const QString targetOS = dictionary.value("TARGET_OS"); - if (!targetOS.isEmpty()) - configStream << "QMAKE_TARGET_OS = " << targetOS << endl; - if (!dictionary["QMAKE_RPATHDIR"].isEmpty()) configStream << "QMAKE_RPATHDIR += " << formatPath(dictionary["QMAKE_RPATHDIR"]) << endl; @@ -3561,8 +3536,6 @@ void Configure::displayConfig() sout << "QMAKESPEC..................." << dictionary[ "XQMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl; else sout << "QMAKESPEC..................." << dictionary[ "QMAKESPEC" ] << " (" << dictionary["QMAKESPEC_FROM"] << ")" << endl; - if (!dictionary["TARGET_OS"].isEmpty()) - sout << "Target OS..................." << dictionary["TARGET_OS"] << endl; sout << "Architecture................" << dictionary["QT_ARCH"] << ", features:" << dictionary["QT_CPU_FEATURES"] << endl; sout << "Host Architecture..........." << dictionary["QT_HOST_ARCH"] -- cgit v1.2.3