centralize initialization of CONFIG in mkspecs

"CONFIG += qt warn_on release link_prl" is in every single spec (though for link_prl there is one genuine exception and two apparent omissions). Change-Id: I72e1e315586af828eefa3b0b70998ab892ec3c1a Reviewed-by: Joerg Bornemann <[email protected]>
AndrewTk72 · Sep 8, 2012 · 6a3a234 · 6a3a234
1 parent 809bc47
commit 6a3a234
Show file tree

Hide file tree

Showing 92 changed files with 62 additions and 91 deletions.
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = aix
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex

diff --git a/mkspecs/aix-g++/qmake.conf b/mkspecs/aix-g++/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = aix
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex

diff --git a/mkspecs/aix-xlc-64/qmake.conf b/mkspecs/aix-xlc-64/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = aix
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= xlc
 QMAKE_CC_THREAD		= xlc_r

diff --git a/mkspecs/aix-xlc/qmake.conf b/mkspecs/aix-xlc/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = aix
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= xlc
 QMAKE_CC_THREAD		= xlc_r

diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                 += qt ios warn_on release reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname link_prl
+CONFIG                 += ios reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname
 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
@@ -4,7 +4,6 @@ QMAKE_INCREMENTAL_STYLE = sublib
 include(linux.conf)
 include(gcc-base-unix.conf)
 
-CONFIG                  = qt warn_on release link_prl
 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
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release link_prl
 
 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
@@ -3,7 +3,6 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release link_prl
 
 include(g++-unix.conf)
 include(unix.conf)

diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR = MSVC.NET
 QMAKE_PLATFORM += wince win32
-CONFIG += qt warn_on release incremental flat link_prl precompile_header autogen_precompile_source debug_and_release debug_and_release_target
+CONFIG += incremental flat 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
@@ -6,7 +6,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = cygwin unix posix
-CONFIG			+= qt warn_on release incremental link_prl
+CONFIG += incremental
 QMAKE_INCREMENTAL_STYLE  = sublib
 
 QMAKE_CC		= gcc

diff --git a/mkspecs/darwin-g++/qmake.conf b/mkspecs/darwin-g++/qmake.conf
@@ -6,7 +6,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = mac macx
-CONFIG			+= qt warn_on release link_prl native_precompiled_headers
+CONFIG += native_precompiled_headers
 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
@@ -1,7 +1,7 @@
 QT_QPA_DEFAULT_PLATFORM = eglfs
 
 MAKEFILE_GENERATOR  = UNIX
-CONFIG              += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG              += incremental gdb_dwarf_index
 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
@@ -7,7 +7,7 @@
 # http://github.com/KDAB/OpenEmbedded-Archos
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-CONFIG += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG += incremental gdb_dwarf_index
 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
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -3,7 +3,7 @@
 # http://beagleboard.org/
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -3,7 +3,7 @@
 # http://wiki.qt-project.org/Devices/N9
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -5,7 +5,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 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
@@ -3,7 +3,7 @@
 # http://qt-project.org/wiki/Snowball
 
 MAKEFILE_GENERATOR  = UNIX
-CONFIG              += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG              += incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../../common/linux.conf)

diff --git a/mkspecs/features/spec_pre.prf b/mkspecs/features/spec_pre.prf
@@ -39,4 +39,5 @@ equals(QMAKE_HOST.os, Windows) {
     QMAKE_SH            = sh
 }
 
+CONFIG = qt warn_on release link_prl
 QT = core gui
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = freebsd bsd
-CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
+CONFIG += gdb_dwarf_index
 
 QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
 

diff --git a/mkspecs/freebsd-g++46/qmake.conf b/mkspecs/freebsd-g++46/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = freebsd bsd
-CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
+CONFIG += gdb_dwarf_index
 
 QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
 

diff --git a/mkspecs/freebsd-icc/qmake.conf b/mkspecs/freebsd-icc/qmake.conf
@@ -29,7 +29,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = freebsd bsd
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= icc
 QMAKE_LEX		= flex

diff --git a/mkspecs/hpux-acc-64/qmake.conf b/mkspecs/hpux-acc-64/qmake.conf
@@ -47,7 +47,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl
 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
@@ -47,7 +47,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= cc
 QMAKE_LEX		= flex

diff --git a/mkspecs/hpux-acc/qmake.conf b/mkspecs/hpux-acc/qmake.conf
@@ -26,7 +26,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl
 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
@@ -7,7 +7,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex

diff --git a/mkspecs/hpux-g++/qmake.conf b/mkspecs/hpux-g++/qmake.conf
@@ -7,7 +7,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl plugin_no_soname
+CONFIG += plugin_no_soname
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex

diff --git a/mkspecs/hpuxi-acc-32/qmake.conf b/mkspecs/hpuxi-acc-32/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release plugin_no_soname
+CONFIG += plugin_no_soname
 
 QMAKE_CC		= cc
 QMAKE_LEX		= lex

diff --git a/mkspecs/hpuxi-acc-64/qmake.conf b/mkspecs/hpuxi-acc-64/qmake.conf
@@ -47,7 +47,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release plugin_no_soname
+CONFIG += plugin_no_soname
 
 QMAKE_CC		= cc
 QMAKE_LEX		= lex

diff --git a/mkspecs/hpuxi-g++-64/qmake.conf b/mkspecs/hpuxi-g++-64/qmake.conf
@@ -12,7 +12,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hpux
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= gcc
 QMAKE_LEX		= flex

diff --git a/mkspecs/hurd-g++/qmake.conf b/mkspecs/hurd-g++/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = hurd
-CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG += incremental gdb_dwarf_index
 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
@@ -36,7 +36,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = irix
-CONFIG			+= qt warn_on release link_prl
 QMAKE_COMPILER_DEFINES  += __sgi __EDG
 
 QMAKE_CC		= cc

diff --git a/mkspecs/irix-cc/qmake.conf b/mkspecs/irix-cc/qmake.conf
@@ -36,7 +36,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = irix
-CONFIG			+= qt warn_on release link_prl
 QMAKE_COMPILER_DEFINES  += __sgi __EDG
 
 QMAKE_CC		= cc

diff --git a/mkspecs/irix-g++-64/qmake.conf b/mkspecs/irix-g++-64/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = irix
-CONFIG			+= qt warn_on release link_prl
 QMAKE_COMPILER_DEFINES  += __sgi __GNUC__
 
 QMAKE_CC		= gcc

diff --git a/mkspecs/irix-g++/qmake.conf b/mkspecs/irix-g++/qmake.conf
@@ -4,7 +4,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = irix
-CONFIG			+= qt warn_on release link_prl
 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
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                  += incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/linux.conf)

diff --git a/mkspecs/linux-clang/qmake.conf b/mkspecs/linux-clang/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR = UNIX
-CONFIG += qt warn_on release incremental link_prl
+CONFIG += incremental
 
 QMAKE_INCREMENTAL_STYLE = sublib
 

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
@@ -6,7 +6,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = linux
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= ccc
 QMAKE_LEX		= flex

diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
@@ -6,7 +6,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = linux
-CONFIG			+= qt warn_on release link_prl
 
 QMAKE_CC		= ecc
 QMAKE_LEX		= flex

diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR	= UNIX
-CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG += incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
 QMAKE_CFLAGS		= -m32

diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
@@ -6,7 +6,7 @@
 #
 
 MAKEFILE_GENERATOR	= UNIX
-CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG += incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
 QMAKE_CFLAGS		= -m64

diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR      = UNIX
 QMAKE_PLATFORM          = maemo
-CONFIG                 += qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG                 += incremental gdb_dwarf_index
 CONFIG                 += nostrip
 QMAKE_INCREMENTAL_STYLE = sublib
 

diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR	= UNIX
-CONFIG			+= qt warn_on release incremental link_prl gdb_dwarf_index
+CONFIG += incremental gdb_dwarf_index
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../common/linux.conf)