summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mkspecs/aix-g++-64/qmake.conf1
-rw-r--r--mkspecs/aix-g++/qmake.conf1
-rw-r--r--mkspecs/aix-xlc-64/qmake.conf1
-rw-r--r--mkspecs/aix-xlc/qmake.conf1
-rw-r--r--mkspecs/common/ios.conf1
-rw-r--r--mkspecs/common/linux-android.conf1
-rw-r--r--mkspecs/common/qcc-base-qnx-armv7le.conf1
-rw-r--r--mkspecs/common/qcc-base-qnx-x86.conf1
-rw-r--r--mkspecs/common/wince/qmake.conf1
-rw-r--r--mkspecs/cygwin-g++/qmake.conf1
-rw-r--r--mkspecs/darwin-g++/qmake.conf1
-rw-r--r--mkspecs/devices/common/linux_device_pre.conf1
-rw-r--r--mkspecs/devices/linux-archos-gen8-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-beagleboard-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-n9-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf1
-rw-r--r--mkspecs/devices/linux-snowball-g++/qmake.conf1
-rw-r--r--mkspecs/features/spec_pre.prf2
-rw-r--r--mkspecs/freebsd-g++/qmake.conf1
-rw-r--r--mkspecs/freebsd-g++46/qmake.conf1
-rw-r--r--mkspecs/freebsd-icc/qmake.conf1
-rw-r--r--mkspecs/hpux-acc-64/qmake.conf1
-rw-r--r--mkspecs/hpux-acc-o64/qmake.conf1
-rw-r--r--mkspecs/hpux-acc/qmake.conf1
-rw-r--r--mkspecs/hpux-g++-64/qmake.conf1
-rw-r--r--mkspecs/hpux-g++/qmake.conf1
-rw-r--r--mkspecs/hpuxi-acc-32/qmake.conf1
-rw-r--r--mkspecs/hpuxi-acc-64/qmake.conf1
-rw-r--r--mkspecs/hpuxi-g++-64/qmake.conf1
-rw-r--r--mkspecs/hurd-g++/qmake.conf1
-rw-r--r--mkspecs/irix-cc-64/qmake.conf1
-rw-r--r--mkspecs/irix-cc/qmake.conf1
-rw-r--r--mkspecs/irix-g++-64/qmake.conf1
-rw-r--r--mkspecs/irix-g++/qmake.conf1
-rw-r--r--mkspecs/linux-arm-gnueabi-g++/qmake.conf1
-rw-r--r--mkspecs/linux-clang/qmake.conf1
-rw-r--r--mkspecs/linux-cxx/qmake.conf1
-rw-r--r--mkspecs/linux-ecc-64/qmake.conf1
-rw-r--r--mkspecs/linux-g++-32/qmake.conf1
-rw-r--r--mkspecs/linux-g++-64/qmake.conf1
-rw-r--r--mkspecs/linux-g++-maemo/qmake.conf1
-rw-r--r--mkspecs/linux-g++/qmake.conf1
-rw-r--r--mkspecs/linux-icc/qmake.conf1
-rw-r--r--mkspecs/linux-kcc/qmake.conf1
-rw-r--r--mkspecs/linux-llvm/qmake.conf1
-rw-r--r--mkspecs/linux-lsb-g++/qmake.conf1
-rw-r--r--mkspecs/linux-pgcc/qmake.conf1
-rw-r--r--mkspecs/lynxos-g++/qmake.conf1
-rw-r--r--mkspecs/macx-clang-32/qmake.conf1
-rw-r--r--mkspecs/macx-clang-libc++-32/qmake.conf1
-rw-r--r--mkspecs/macx-clang-libc++/qmake.conf1
-rw-r--r--mkspecs/macx-clang/qmake.conf1
-rw-r--r--mkspecs/macx-g++-32/qmake.conf1
-rw-r--r--mkspecs/macx-g++/qmake.conf1
-rw-r--r--mkspecs/macx-g++40/qmake.conf1
-rw-r--r--mkspecs/macx-g++42/qmake.conf1
-rw-r--r--mkspecs/macx-icc/qmake.conf1
-rw-r--r--mkspecs/macx-llvm/qmake.conf1
-rw-r--r--mkspecs/macx-xcode/qmake.conf1
-rw-r--r--mkspecs/macx-xlc/qmake.conf1
-rw-r--r--mkspecs/netbsd-g++/qmake.conf1
-rw-r--r--mkspecs/openbsd-g++/qmake.conf1
-rw-r--r--mkspecs/sco-cc/qmake.conf1
-rw-r--r--mkspecs/sco-g++/qmake.conf1
-rw-r--r--mkspecs/solaris-cc-64/qmake.conf1
-rw-r--r--mkspecs/solaris-cc/qmake.conf1
-rw-r--r--mkspecs/solaris-g++-64/qmake.conf1
-rw-r--r--mkspecs/solaris-g++/qmake.conf1
-rw-r--r--mkspecs/tru64-cxx/qmake.conf1
-rw-r--r--mkspecs/tru64-g++/qmake.conf1
-rw-r--r--mkspecs/unixware-cc/qmake.conf1
-rw-r--r--mkspecs/unixware-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/integrity-ghs/qmake.conf1
-rw-r--r--mkspecs/unsupported/linux-armcc/qmake.conf1
-rw-r--r--mkspecs/unsupported/linux-host-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/nacl-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/nacl64-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/qnx-X11-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf1
-rw-r--r--mkspecs/unsupported/vxworks-ppc-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf1
-rw-r--r--mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf1
-rw-r--r--mkspecs/unsupported/win32-msvc2003/qmake.conf1
-rw-r--r--mkspecs/win32-g++/qmake.conf1
-rw-r--r--mkspecs/win32-icc/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2005/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2008/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2010/qmake.conf1
-rw-r--r--mkspecs/win32-msvc2012/qmake.conf1
94 files changed, 2 insertions, 93 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
index 37ad49f0ff..fefcec28de 100644
--- a/mkspecs/aix-g++-64/qmake.conf
+++ b/mkspecs/aix-g++-64/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
index 0260147ee1..6c6efa0fab 100644
--- a/mkspecs/aix-g++/qmake.conf
+++ b/mkspecs/aix-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
index 12977eed55..7b774089eb 100644
--- a/mkspecs/aix-xlc-64/qmake.conf
+++ b/mkspecs/aix-xlc-64/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
index 12bc34b07f..f8de99f542 100644
--- a/mkspecs/aix-xlc/qmake.conf
+++ b/mkspecs/aix-xlc/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = aix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf
index edec1a1f2b..53b8f30691 100644
--- a/mkspecs/common/ios.conf
+++ b/mkspecs/common/ios.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt ios warn_on release reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui opengl
QMAKE_INCREMENTAL_STYLE = sublib
# Qt can't build iOS app bundle :(
diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf
index 7f694f548a..eef0166b6b 100644
--- a/mkspecs/common/linux-android.conf
+++ b/mkspecs/common/linux-android.conf
@@ -5,7 +5,6 @@ include(linux.conf)
include(gcc-base-unix.conf)
CONFIG = qt warn_on release link_prl
-QT = core gui
DEFINES += Q_OS_LINUX_ANDROID
DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG
QT_QPA_DEFAULT_PLATFORM = minimal
diff --git a/mkspecs/common/qcc-base-qnx-armv7le.conf b/mkspecs/common/qcc-base-qnx-armv7le.conf
index e68f0a689a..dd92b2d710 100644
--- a/mkspecs/common/qcc-base-qnx-armv7le.conf
+++ b/mkspecs/common/qcc-base-qnx-armv7le.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release link_prl
-QT += core gui
include(g++-unix.conf)
include(unix.conf)
diff --git a/mkspecs/common/qcc-base-qnx-x86.conf b/mkspecs/common/qcc-base-qnx-x86.conf
index 0140155f5d..840c490f9e 100644
--- a/mkspecs/common/qcc-base-qnx-x86.conf
+++ b/mkspecs/common/qcc-base-qnx-x86.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release link_prl
-QT += core gui
include(g++-unix.conf)
include(unix.conf)
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 6a9daa5e57..1c280f0a01 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = MSVC.NET
QMAKE_PLATFORM += wince win32
-QT += core gui
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target
DEFINES += UNDER_CE WINCE _WINDOWS _UNICODE UNICODE _WIN32 QT_NO_PRINTER QT_NO_PRINTDIALOG
diff --git a/mkspecs/cygwin-g++/qmake.conf b/mkspecs/cygwin-g++/qmake.conf
index 9b178492aa..31a9b92800 100644
--- a/mkspecs/cygwin-g++/qmake.conf
+++ b/mkspecs/cygwin-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = cygwin unix posix
CONFIG += qt warn_on release incremental link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_CC = gcc
diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
index 271f24c87e..fe732c0fa4 100644
--- a/mkspecs/darwin-g++/qmake.conf
+++ b/mkspecs/darwin-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = mac macx
CONFIG += qt warn_on release link_prl native_precompiled_headers
-QT += core gui
DEFINES += __USE_WS_X11__
QMAKE_CC = cc
diff --git a/mkspecs/devices/common/linux_device_pre.conf b/mkspecs/devices/common/linux_device_pre.conf
index bc49990aa7..a62f869c5f 100644
--- a/mkspecs/devices/common/linux_device_pre.conf
+++ b/mkspecs/devices/common/linux_device_pre.conf
@@ -2,7 +2,6 @@ QT_QPA_DEFAULT_PLATFORM = eglfs
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
index 77f1b6d438..29d0132adb 100644
--- a/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
+++ b/mkspecs/devices/linux-archos-gen8-g++/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
index 9b009b9f34..a6356e3c03 100644
--- a/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
index 739ebaaa26..9f5032e2f9 100644
--- a/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
+++ b/mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf
@@ -6,7 +6,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-beagleboard-g++/qmake.conf b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
index 39d2a514da..2b6c77ca9e 100644
--- a/mkspecs/devices/linux-beagleboard-g++/qmake.conf
+++ b/mkspecs/devices/linux-beagleboard-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
index b7d96698c6..0138e37860 100644
--- a/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
+++ b/mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf
index 92c4a77017..d9170009a5 100644
--- a/mkspecs/devices/linux-n9-g++/qmake.conf
+++ b/mkspecs/devices/linux-n9-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
index a898841eaa..0453dca8e1 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf
@@ -6,7 +6,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
index 668513dc6f..4a92cb850d 100644
--- a/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
+++ b/mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf
@@ -6,7 +6,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/devices/linux-snowball-g++/qmake.conf b/mkspecs/devices/linux-snowball-g++/qmake.conf
index 9fb70de064..82af66ecfc 100644
--- a/mkspecs/devices/linux-snowball-g++/qmake.conf
+++ b/mkspecs/devices/linux-snowball-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf
index 34dab535ba..7a7c626894 100644
--- a/mkspecs/features/spec_pre.prf
+++ b/mkspecs/features/spec_pre.prf
@@ -38,3 +38,5 @@ equals(QMAKE_HOST.os, Windows) {
QMAKE_EXT_OBJ = .o
QMAKE_SH = sh
}
+
+QT = core gui
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
index aa8a6d96f6..79b0af5bbb 100644
--- a/mkspecs/freebsd-g++/qmake.conf
+++ b/mkspecs/freebsd-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = freebsd bsd
CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
index 11026cc7a2..7f6313a2aa 100644
--- a/mkspecs/freebsd-g++46/qmake.conf
+++ b/mkspecs/freebsd-g++46/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = freebsd bsd
CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
index 3628346219..9e56aa61e9 100644
--- a/mkspecs/freebsd-icc/qmake.conf
+++ b/mkspecs/freebsd-icc/qmake.conf
@@ -30,7 +30,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = freebsd bsd
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = icc
QMAKE_LEX = flex
diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
index 241a5d086d..d93bf25cbf 100644
--- a/mkspecs/hpux-acc-64/qmake.conf
+++ b/mkspecs/hpux-acc-64/qmake.conf
@@ -48,7 +48,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
QMAKE_CC = cc
diff --git a/mkspecs/hpux-acc-o64/qmake.conf b/mkspecs/hpux-acc-o64/qmake.conf
index 8daec7505a..009e33c66d 100644
--- a/mkspecs/hpux-acc-o64/qmake.conf
+++ b/mkspecs/hpux-acc-o64/qmake.conf
@@ -48,7 +48,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = flex
diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
index a40120b441..c584e63323 100644
--- a/mkspecs/hpux-acc/qmake.conf
+++ b/mkspecs/hpux-acc/qmake.conf
@@ -27,7 +27,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __hpux __HP_aCC
QMAKE_CC = cc
diff --git a/mkspecs/hpux-g++-64/qmake.conf b/mkspecs/hpux-g++-64/qmake.conf
index e6e9304fe3..6abdca8e01 100644
--- a/mkspecs/hpux-g++-64/qmake.conf
+++ b/mkspecs/hpux-g++-64/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
index 077ab25021..918a972227 100644
--- a/mkspecs/hpux-g++/qmake.conf
+++ b/mkspecs/hpux-g++/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl plugin_no_soname
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
index 95c38312f1..0ad27a75ca 100644
--- a/mkspecs/hpuxi-acc-32/qmake.conf
+++ b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release plugin_no_soname
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = lex
diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
index 04927322a7..74ced51bf9 100644
--- a/mkspecs/hpuxi-acc-64/qmake.conf
+++ b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -48,7 +48,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release plugin_no_soname
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = lex
diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
index e608a9ef43..0c137d8fd2 100644
--- a/mkspecs/hpuxi-g++-64/qmake.conf
+++ b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -13,7 +13,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hpux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
index 7fe2af7434..8c0be55adc 100644
--- a/mkspecs/hurd-g++/qmake.conf
+++ b/mkspecs/hurd-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = hurd
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_CFLAGS_THREAD += -D_REENTRANT
diff --git a/mkspecs/irix-cc-64/qmake.conf b/mkspecs/irix-cc-64/qmake.conf
index 3ebbe7bf1e..e9afaa969a 100644
--- a/mkspecs/irix-cc-64/qmake.conf
+++ b/mkspecs/irix-cc-64/qmake.conf
@@ -37,7 +37,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __sgi __EDG
QMAKE_CC = cc
diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
index c501a024c6..1db0e4fc68 100644
--- a/mkspecs/irix-cc/qmake.conf
+++ b/mkspecs/irix-cc/qmake.conf
@@ -37,7 +37,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __sgi __EDG
QMAKE_CC = cc
diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
index 8a63b26cb3..a654d7af3d 100644
--- a/mkspecs/irix-g++-64/qmake.conf
+++ b/mkspecs/irix-g++-64/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __sgi __GNUC__
QMAKE_CC = gcc
diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
index 980816f366..0d292fe647 100644
--- a/mkspecs/irix-g++/qmake.conf
+++ b/mkspecs/irix-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = irix
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_COMPILER_DEFINES += __sgi __GNUC__
QMAKE_CC = gcc
diff --git a/mkspecs/linux-arm-gnueabi-g++/qmake.conf b/mkspecs/linux-arm-gnueabi-g++/qmake.conf
index 64291f7ff0..c9ab4a832f 100644
--- a/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+++ b/mkspecs/linux-arm-gnueabi-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/linux.conf)
diff --git a/mkspecs/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf
index cf7e43df42..1ba922cf49 100644
--- a/mkspecs/linux-clang/qmake.conf
+++ b/mkspecs/linux-clang/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index 92d0b41671..824a07eade 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = ccc
QMAKE_LEX = flex
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index 816c1146e0..373faee2cf 100644
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = ecc
QMAKE_LEX = flex
diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
index 7d6dbcafb1..9c6af8f469 100644
--- a/mkspecs/linux-g++-32/qmake.conf
+++ b/mkspecs/linux-g++-32/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_CFLAGS = -m32
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index e65c539ba0..66b30ccaf1 100644
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_CFLAGS = -m64
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
index fb6a7db0fb..be655ed9e8 100644
--- a/mkspecs/linux-g++-maemo/qmake.conf
+++ b/mkspecs/linux-g++-maemo/qmake.conf
@@ -6,7 +6,6 @@ MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = maemo
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
CONFIG += nostrip
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../linux-arm-gnueabi-g++/qmake.conf)
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 9362901fa3..51ba383946 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/linux.conf)
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index 91eff667d0..e412f81e93 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
QMAKE_CC = icc
QMAKE_LEX = flex
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index 54cb98ea7d..a4661ce014 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -16,7 +16,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = KCC
QMAKE_LEX = flex
diff --git a/mkspecs/linux-llvm/qmake.conf b/mkspecs/linux-llvm/qmake.conf
index ac1920c79d..5b1217b49f 100644
--- a/mkspecs/linux-llvm/qmake.conf
+++ b/mkspecs/linux-llvm/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/linux.conf)
diff --git a/mkspecs/linux-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf
index 689775d519..8ef7475b33 100644
--- a/mkspecs/linux-lsb-g++/qmake.conf
+++ b/mkspecs/linux-lsb-g++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/linux.conf)
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index 2bc016bdfc..2c2e8c2dec 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = pgcc
QMAKE_LEX = flex
diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf
index 1d3b5b7751..bdc109a361 100644
--- a/mkspecs/lynxos-g++/qmake.conf
+++ b/mkspecs/lynxos-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = lynxos
CONFIG += qt warn_on release incremental link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
QMAKE_CC = gcc
diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf
index c34bb514fb..f5a7f561b4 100644
--- a/mkspecs/macx-clang-32/qmake.conf
+++ b/mkspecs/macx-clang-32/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-clang-libc++-32/qmake.conf b/mkspecs/macx-clang-libc++-32/qmake.conf
index a497c5b94d..274f71a030 100644
--- a/mkspecs/macx-clang-libc++-32/qmake.conf
+++ b/mkspecs/macx-clang-libc++-32/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-clang-libc++/qmake.conf b/mkspecs/macx-clang-libc++/qmake.conf
index 6c9cc422b7..6323d9ac89 100644
--- a/mkspecs/macx-clang-libc++/qmake.conf
+++ b/mkspecs/macx-clang-libc++/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf
index cda9b7286c..af5ed2c61b 100644
--- a/mkspecs/macx-clang/qmake.conf
+++ b/mkspecs/macx-clang/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-g++-32/qmake.conf b/mkspecs/macx-g++-32/qmake.conf
index abcf9a814d..0af5ecb8e0 100644
--- a/mkspecs/macx-g++-32/qmake.conf
+++ b/mkspecs/macx-g++-32/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf
index 95f5733255..a3273be751 100644
--- a/mkspecs/macx-g++/qmake.conf
+++ b/mkspecs/macx-g++/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf
index 7eacebd275..9140c27dd3 100644
--- a/mkspecs/macx-g++40/qmake.conf
+++ b/mkspecs/macx-g++40/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-g++42/qmake.conf b/mkspecs/macx-g++42/qmake.conf
index 3ebda936e8..09a44d0a2c 100644
--- a/mkspecs/macx-g++42/qmake.conf
+++ b/mkspecs/macx-g++42/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf
index c05812a10f..c8ba86399d 100644
--- a/mkspecs/macx-icc/qmake.conf
+++ b/mkspecs/macx-icc/qmake.conf
@@ -14,7 +14,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release link_prl app_bundle
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublibs
QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__
diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf
index 9b7d3cc962..dd95860b23 100644
--- a/mkspecs/macx-llvm/qmake.conf
+++ b/mkspecs/macx-llvm/qmake.conf
@@ -8,7 +8,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../common/mac.conf)
diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf
index f35c2f54d3..7d4258dbee 100644
--- a/mkspecs/macx-xcode/qmake.conf
+++ b/mkspecs/macx-xcode/qmake.conf
@@ -6,7 +6,6 @@
MAKEFILE_GENERATOR = XCODE
CONFIG += qt warn_on release lib_version_first incremental plugin_no_soname link_prl app_bundle
-QT += core gui
include(../common/mac.conf)
include(../common/gcc-base-macx.conf)
diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf
index 0a7eb20658..bc5a2c8da4 100644
--- a/mkspecs/macx-xlc/qmake.conf
+++ b/mkspecs/macx-xlc/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = mac macx
CONFIG += qt warn_on release app_bundle global_init_link_order lib_version_first plugin_no_soname link_prl
-QT += core gui
QMAKE_CC = xlc
QMAKE_CC_THREAD = xlc_r
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 893001f196..0c598b7b1f 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = netbsd bsd
CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf
index 5164ea835e..a8015a7a47 100644
--- a/mkspecs/openbsd-g++/qmake.conf
+++ b/mkspecs/openbsd-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = openbsd bsd
CONFIG += qt warn_on release link_prl gdb_dwarf_index
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf
index 9052806bb9..c9d553ec61 100644
--- a/mkspecs/sco-cc/qmake.conf
+++ b/mkspecs/sco-cc/qmake.conf
@@ -9,7 +9,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = sco
-QT += core gui
CONFIG += qt warn_on release link_prl
QMAKE_CC = cc
diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf
index 1d63dd1db6..c3ea137680 100644
--- a/mkspecs/sco-g++/qmake.conf
+++ b/mkspecs/sco-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = sco
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf
index 49035eb0d2..196d1be4a4 100644
--- a/mkspecs/solaris-cc-64/qmake.conf
+++ b/mkspecs/solaris-cc-64/qmake.conf
@@ -24,7 +24,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = flex
diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf
index a688e7ff88..5f0b4fc106 100644
--- a/mkspecs/solaris-cc/qmake.conf
+++ b/mkspecs/solaris-cc/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = flex
diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index e34b689dd3..742ef0d73a 100644
--- a/mkspecs/solaris-g++-64/qmake.conf
+++ b/mkspecs/solaris-g++-64/qmake.conf
@@ -28,7 +28,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 6d743b5819..a6a81a1513 100644
--- a/mkspecs/solaris-g++/qmake.conf
+++ b/mkspecs/solaris-g++/qmake.conf
@@ -11,7 +11,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = solaris
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf
index c3c3e1c62f..c56bca6ac4 100644
--- a/mkspecs/tru64-cxx/qmake.conf
+++ b/mkspecs/tru64-cxx/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = tru64
CONFIG += qt warn_on release link_prl plugin_no_soname
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = flex
diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf
index 8604a7d9bf..20355f491f 100644
--- a/mkspecs/tru64-g++/qmake.conf
+++ b/mkspecs/tru64-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = tru64
CONFIG += qt warn_on release link_prl plugin_no_soname
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf
index 03de849d4f..54c9e925eb 100644
--- a/mkspecs/unixware-cc/qmake.conf
+++ b/mkspecs/unixware-cc/qmake.conf
@@ -10,7 +10,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = unixware
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = cc
QMAKE_LEX = flex
diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf
index 1e6c1e1b11..5c00e622f9 100644
--- a/mkspecs/unixware-g++/qmake.conf
+++ b/mkspecs/unixware-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = unixware
CONFIG += qt warn_on release link_prl
-QT += core gui
QMAKE_CC = gcc
QMAKE_LEX = flex
diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index ed1c3efe30..2cd36b5829 100644
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = GBUILD
QMAKE_PLATFORM = integrity unix posix
CONFIG += qt warn_on release
-QT += core gui network
QMAKE_CFLAGS = -bsp $$INTEGRITY_BSP -os_dir $__OS_DIR
QMAKE_CFLAGS += --diag_suppress=1,228,236,381,611,997
diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf
index 1b3b132ca9..1c73e55879 100644
--- a/mkspecs/unsupported/linux-armcc/qmake.conf
+++ b/mkspecs/unsupported/linux-armcc/qmake.conf
@@ -4,7 +4,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl armcc_linker
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/unsupported/linux-host-g++/qmake.conf b/mkspecs/unsupported/linux-host-g++/qmake.conf
index 783242603d..b3dfc71708 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -15,7 +15,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = linux
CONFIG += qt warn_on release incremental link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
#
diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
index 8ab9599ada..d20783ff1d 100644
--- a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
@@ -13,7 +13,6 @@
MAKEFILE_GENERATOR = UNIX
CONFIG += qt warn_on release incremental link_prl
-QT += core gui
QMAKE_INCREMENTAL_STYLE = sublib
include(../../common/linux.conf)
diff --git a/mkspecs/unsupported/nacl-g++/qmake.conf b/mkspecs/unsupported/nacl-g++/qmake.conf
index f5dee80413..581422fcf1 100644
--- a/mkspecs/unsupported/nacl-g++/qmake.conf
+++ b/mkspecs/unsupported/nacl-g++/qmake.conf
@@ -9,6 +9,5 @@ include(../../common/g++-unix.conf)
include(../../common/nacl/nacl-base.conf)
include(../../common/nacl/g++-nacl32.conf)
-QT = core gui
load(qt_config)
diff --git a/mkspecs/unsupported/nacl64-g++/qmake.conf b/mkspecs/unsupported/nacl64-g++/qmake.conf
index 13372b3cc4..fcef45faec 100644
--- a/mkspecs/unsupported/nacl64-g++/qmake.conf
+++ b/mkspecs/unsupported/nacl64-g++/qmake.conf
@@ -9,6 +9,5 @@ include(../../common/g++-unix.conf)
include(../../common/nacl/nacl64-base.conf)
include(../../common/nacl/g++-nacl64.conf)
-QT = core gui
load(qt_config)
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 28d29805f6..6a3ad1f2a8 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = qnx
CONFIG += qt warn_on release link_prl
-QT += core gui
include(../common/gcc-base-unix.conf)
include(../common/g++-unix.conf)
diff --git a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
index e898956fc6..897ccd631c 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = vxworks
CONFIG += qt warn_on release incremental link_prl
-QT += core gui network
QMAKE_INCREMENTAL_STYLE = sublib
VXWORKS_ARCH = ppc
diff --git a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
index e9082efbac..cdac7b3457 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = vxworks
CONFIG += qt warn_on release incremental link_prl
-QT += core gui network
QMAKE_INCREMENTAL_STYLE = sublib
DEFINES += VXWORKS
diff --git a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
index 30a60f2594..27198266f5 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = vxworks
CONFIG += qt warn_on release incremental link_prl
-QT += core gui network
QMAKE_INCREMENTAL_STYLE = sublib
VXWORKS_ARCH = simlinux
diff --git a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
index b892e6fd51..f8ee4df6bc 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -5,7 +5,6 @@
MAKEFILE_GENERATOR = UNIX
QMAKE_PLATFORM = vxworks
CONFIG += qt warn_on release incremental link_prl
-QT += core gui network
QMAKE_INCREMENTAL_STYLE = sublib
DEFINES += VXWORKS
diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index 20ad49f573..cf55ee044a 100644
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = MSVC.NET
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target
-QT += core gui
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1310 WIN32
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index 485d0f573c..a77ea8a54c 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -12,7 +12,6 @@ load(device_config)
MAKEFILE_GENERATOR = MINGW
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release link_prl debug_and_release debug_and_release_target precompile_header
-QT += core gui
DEFINES += UNICODE
QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index 1bd3a3ac88..b5cb7e383a 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = MSVC.NET
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release incremental flat link_prl debug_and_release debug_and_release_target
-QT += core gui
DEFINES += UNICODE
QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 9522fe32e3..a38c0ccb0d 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = MSVC.NET
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-QT += core gui
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1400 WIN32
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 35e33483c3..534d5f4d04 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = MSVC.NET
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-QT += core gui
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1500 WIN32
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index b7bad53398..94ae62683e 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -7,7 +7,6 @@
MAKEFILE_GENERATOR = MSBUILD
QMAKE_PLATFORM = win32
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-QT += core gui
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1600 WIN32
diff --git a/mkspecs/win32-msvc2012/qmake.conf b/mkspecs/win32-msvc2012/qmake.conf
index 1dabd64b57..4feef12e7f 100644
--- a/mkspecs/win32-msvc2012/qmake.conf
+++ b/mkspecs/win32-msvc2012/qmake.conf
@@ -6,7 +6,6 @@
MAKEFILE_GENERATOR = MSBUILD
CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe
-QT += core gui
DEFINES += UNICODE WIN32
QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32