diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-27 16:21:25 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-05 15:49:03 +0000 |
| commit | 0e1efdf549a1b036c58e752f92df5369152bff75 (patch) | |
| tree | 2338fe33cfd7e690427f1da7f582efd0944d914a /mkspecs/features/win32 | |
| parent | 8ca247e287963802f59af1c3243467792f18ba31 (diff) | |
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/features/win32')
| -rw-r--r-- | mkspecs/features/win32/console.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/win32/qt_config.prf | 10 | ||||
| -rw-r--r-- | mkspecs/features/win32/windows.prf | 2 |
3 files changed, 2 insertions, 12 deletions
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 |