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 <[email protected]>
wx984490083 · Sep 8, 2012 · 809bc47 · 809bc47
1 parent cd95997
commit 809bc47
Show file tree

Hide file tree

Showing 94 changed files with 2 additions and 93 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)