From 809bc47fad9129b9e2ccd13432299db171d79e1a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Sep 2012 15:12:07 +0200 Subject: [PATCH] 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 --- mkspecs/aix-g++-64/qmake.conf | 1 - mkspecs/aix-g++/qmake.conf | 1 - mkspecs/aix-xlc-64/qmake.conf | 1 - mkspecs/aix-xlc/qmake.conf | 1 - mkspecs/common/ios.conf | 1 - mkspecs/common/linux-android.conf | 1 - mkspecs/common/qcc-base-qnx-armv7le.conf | 1 - mkspecs/common/qcc-base-qnx-x86.conf | 1 - mkspecs/common/wince/qmake.conf | 1 - mkspecs/cygwin-g++/qmake.conf | 1 - mkspecs/darwin-g++/qmake.conf | 1 - mkspecs/devices/common/linux_device_pre.conf | 1 - mkspecs/devices/linux-archos-gen8-g++/qmake.conf | 1 - mkspecs/devices/linux-arm-amlogic-8726M-g++/qmake.conf | 1 - mkspecs/devices/linux-arm-trident-pnx8473-g++/qmake.conf | 1 - mkspecs/devices/linux-beagleboard-g++/qmake.conf | 1 - mkspecs/devices/linux-mipsel-broadcom-97425-g++/qmake.conf | 1 - mkspecs/devices/linux-n9-g++/qmake.conf | 1 - mkspecs/devices/linux-sh4-stmicro-ST7108-g++/qmake.conf | 1 - mkspecs/devices/linux-sh4-stmicro-ST7540-g++/qmake.conf | 1 - mkspecs/devices/linux-snowball-g++/qmake.conf | 1 - mkspecs/features/spec_pre.prf | 2 ++ mkspecs/freebsd-g++/qmake.conf | 1 - mkspecs/freebsd-g++46/qmake.conf | 1 - mkspecs/freebsd-icc/qmake.conf | 1 - mkspecs/hpux-acc-64/qmake.conf | 1 - mkspecs/hpux-acc-o64/qmake.conf | 1 - mkspecs/hpux-acc/qmake.conf | 1 - mkspecs/hpux-g++-64/qmake.conf | 1 - mkspecs/hpux-g++/qmake.conf | 1 - mkspecs/hpuxi-acc-32/qmake.conf | 1 - mkspecs/hpuxi-acc-64/qmake.conf | 1 - mkspecs/hpuxi-g++-64/qmake.conf | 1 - mkspecs/hurd-g++/qmake.conf | 1 - mkspecs/irix-cc-64/qmake.conf | 1 - mkspecs/irix-cc/qmake.conf | 1 - mkspecs/irix-g++-64/qmake.conf | 1 - mkspecs/irix-g++/qmake.conf | 1 - mkspecs/linux-arm-gnueabi-g++/qmake.conf | 1 - mkspecs/linux-clang/qmake.conf | 1 - mkspecs/linux-cxx/qmake.conf | 1 - mkspecs/linux-ecc-64/qmake.conf | 1 - mkspecs/linux-g++-32/qmake.conf | 1 - mkspecs/linux-g++-64/qmake.conf | 1 - mkspecs/linux-g++-maemo/qmake.conf | 1 - mkspecs/linux-g++/qmake.conf | 1 - mkspecs/linux-icc/qmake.conf | 1 - mkspecs/linux-kcc/qmake.conf | 1 - mkspecs/linux-llvm/qmake.conf | 1 - mkspecs/linux-lsb-g++/qmake.conf | 1 - mkspecs/linux-pgcc/qmake.conf | 1 - mkspecs/lynxos-g++/qmake.conf | 1 - mkspecs/macx-clang-32/qmake.conf | 1 - mkspecs/macx-clang-libc++-32/qmake.conf | 1 - mkspecs/macx-clang-libc++/qmake.conf | 1 - mkspecs/macx-clang/qmake.conf | 1 - mkspecs/macx-g++-32/qmake.conf | 1 - mkspecs/macx-g++/qmake.conf | 1 - mkspecs/macx-g++40/qmake.conf | 1 - mkspecs/macx-g++42/qmake.conf | 1 - mkspecs/macx-icc/qmake.conf | 1 - mkspecs/macx-llvm/qmake.conf | 1 - mkspecs/macx-xcode/qmake.conf | 1 - mkspecs/macx-xlc/qmake.conf | 1 - mkspecs/netbsd-g++/qmake.conf | 1 - mkspecs/openbsd-g++/qmake.conf | 1 - mkspecs/sco-cc/qmake.conf | 1 - mkspecs/sco-g++/qmake.conf | 1 - mkspecs/solaris-cc-64/qmake.conf | 1 - mkspecs/solaris-cc/qmake.conf | 1 - mkspecs/solaris-g++-64/qmake.conf | 1 - mkspecs/solaris-g++/qmake.conf | 1 - mkspecs/tru64-cxx/qmake.conf | 1 - mkspecs/tru64-g++/qmake.conf | 1 - mkspecs/unixware-cc/qmake.conf | 1 - mkspecs/unixware-g++/qmake.conf | 1 - mkspecs/unsupported/integrity-ghs/qmake.conf | 1 - mkspecs/unsupported/linux-armcc/qmake.conf | 1 - mkspecs/unsupported/linux-host-g++/qmake.conf | 1 - mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf | 1 - mkspecs/unsupported/nacl-g++/qmake.conf | 1 - mkspecs/unsupported/nacl64-g++/qmake.conf | 1 - mkspecs/unsupported/qnx-X11-g++/qmake.conf | 1 - mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf | 1 - mkspecs/unsupported/vxworks-ppc-g++/qmake.conf | 1 - mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf | 1 - mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf | 1 - mkspecs/unsupported/win32-msvc2003/qmake.conf | 1 - mkspecs/win32-g++/qmake.conf | 1 - mkspecs/win32-icc/qmake.conf | 1 - mkspecs/win32-msvc2005/qmake.conf | 1 - mkspecs/win32-msvc2008/qmake.conf | 1 - mkspecs/win32-msvc2010/qmake.conf | 1 - mkspecs/win32-msvc2012/qmake.conf | 1 - 94 files changed, 2 insertions(+), 93 deletions(-) diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index 37ad49f0ffc..fefcec28de2 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 0260147ee15..6c6efa0faba 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 12977eed557..7b774089eb5 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 12bc34b07f0..f8de99f5424 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 edec1a1f2ba..53b8f30691d 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 7f694f548a4..eef0166b6bf 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 e68f0a689ad..dd92b2d7104 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 0140155f5d7..840c490f9eb 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 6a9daa5e576..1c280f0a01d 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 9b178492aa3..31a9b928000 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 271f24c87e4..fe732c0fa41 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 bc49990aa75..a62f869c5f0 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 77f1b6d4381..29d0132adbb 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 9b009b9f349..a6356e3c036 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 739ebaaa265..9f5032e2f96 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 39d2a514dab..2b6c77ca9e2 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 b7d96698c6e..0138e378609 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 92c4a770171..d9170009a53 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 a898841eaa0..0453dca8e1a 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 668513dc6f2..4a92cb850d6 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 9fb70de064c..82af66ecfc5 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 34dab535bad..7a7c6268941 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 aa8a6d96f6a..79b0af5bbbc 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 11026cc7a25..7f6313a2aa5 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 36283462193..9e56aa61e9a 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 241a5d086df..d93bf25cbf7 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 8daec7505a7..009e33c66d3 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 a40120b441d..c584e63323e 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 e6e9304fe31..6abdca8e01e 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 077ab250212..918a972227f 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 95c38312f1f..0ad27a75ca8 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 04927322a73..74ced51bf96 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 e608a9ef434..0c137d8fd29 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 7fe2af7434f..8c0be55adcd 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 3ebbe7bf1e4..e9afaa969ab 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 c501a024c68..1db0e4fc68d 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 8a63b26cb36..a654d7af3db 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 980816f3667..0d292fe6475 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 64291f7ff0c..c9ab4a832f7 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 cf7e43df422..1ba922cf49d 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 92d0b416711..824a07eade8 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 816c1146e01..373faee2cfa 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 7d6dbcafb14..9c6af8f469b 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 e65c539ba0f..66b30ccaf14 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 fb6a7db0fb8..be655ed9e84 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 9362901fa3b..51ba3839465 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 91eff667d0f..e412f81e93e 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 54cb98ea7d1..a4661ce0145 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 ac1920c79d7..5b1217b49f4 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 689775d5199..8ef7475b33c 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 2bc016bdfc3..2c2e8c2decd 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 1d3b5b77519..bdc109a3611 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 c34bb514fba..f5a7f561b47 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 a497c5b94d9..274f71a030f 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 6c9cc422b77..6323d9ac89a 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 cda9b7286ca..af5ed2c61b5 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 abcf9a814d7..0af5ecb8e07 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 95f57332552..a3273be751d 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 7eacebd2758..9140c27dd38 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 3ebda936e8d..09a44d0a2cb 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 c05812a10ff..c8ba86399d2 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 9b7d3cc9627..dd95860b230 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 f35c2f54d33..7d4258dbee1 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 0a7eb206581..bc5a2c8da44 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 893001f196d..0c598b7b1fc 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 5164ea835e1..a8015a7a472 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 9052806bb93..c9d553ec612 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 1d63dd1db6d..c3ea137680d 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 49035eb0d27..196d1be4a4f 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 a688e7ff88f..5f0b4fc106c 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 e34b689dd36..742ef0d73a5 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 6d743b58190..a6a81a1513e 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 c3c3e1c62f1..c56bca6ac4a 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 8604a7d9bf5..20355f491f7 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 03de849d4f6..54c9e925eb8 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 1e6c1e1b114..5c00e622f93 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 ed1c3efe30b..2cd36b58293 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 1b3b132ca99..1c73e558797 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 783242603d1..b3dfc717082 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 8ab9599ada7..d20783ff1d3 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 f5dee804134..581422fcf17 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 13372b3cc43..fcef45faece 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 28d29805f6f..6a3ad1f2a85 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 e898956fc68..897ccd631c2 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 e9082efbac7..cdac7b3457e 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 30a60f25945..27198266f50 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 b892e6fd512..f8ee4df6bcc 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 20ad49f5734..cf55ee044a9 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 485d0f573ce..a77ea8a54c0 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 1bd3a3ac88f..b5cb7e383a7 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 9522fe32e31..a38c0ccb0dd 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 35e33483c31..534d5f4d042 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 b7bad53398b..94ae62683e1 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 1dabd64b57c..4feef12e7f1 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