centralize initialization of QT in specs

there is no reason whatsoever to duplicate this so many times, and even less reason to have specs with a deviating default. Change-Id: Ia25836c079580adebc373697b8bd03598f79c69b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-03 15:12:07 +02:00 · 2012-09-03 15:12:07 +02:00 · 809bc47fad
commit 809bc47fad
parent cd9599792e
94 changed files with 2 additions and 93 deletions
--- 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
--- 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
--- 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
--- 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
--- 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 :(
--- 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
--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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

--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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
--- 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
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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__

--- 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)
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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

 #
--- 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)
--- 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)
--- 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)
--- 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)
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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