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 <joerg.bornemann@nokia.com>

10 files changed, 9 insertions, 10 deletions

diff --git a/mkspecs/unsupported/integrity-ghs/qmake.conf b/mkspecs/unsupported/integrity-ghs/qmake.conf
index 2cd36b5829..72f31477df 100644
--- a/mkspecs/unsupported/integrity-ghs/qmake.conf
+++ b/mkspecs/unsupported/integrity-ghs/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR	= GBUILD
 QMAKE_PLATFORM = integrity unix posix
-CONFIG			+= qt warn_on release
+CONFIG -= link_prl   # Not implemented
 
 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 1c73e55879..a65f8d534e 100644
--- a/mkspecs/unsupported/linux-armcc/qmake.conf
+++ b/mkspecs/unsupported/linux-armcc/qmake.conf
@@ -3,7 +3,7 @@
 #
 
 MAKEFILE_GENERATOR      = UNIX
-CONFIG                  += qt warn_on release incremental link_prl armcc_linker
+CONFIG                  += incremental armcc_linker
 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 b3dfc71708..7437e784ce 100644
--- a/mkspecs/unsupported/linux-host-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-host-g++/qmake.conf
@@ -14,7 +14,7 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = linux
-CONFIG			+= qt warn_on release incremental link_prl
+CONFIG += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
 #
diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
index d20783ff1d..069b016adb 100644
--- a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+++ b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
@@ -12,7 +12,7 @@
 # $staging/usr/lib/pkgconfig)
 
 MAKEFILE_GENERATOR	= UNIX
-CONFIG			+= qt warn_on release incremental link_prl
+CONFIG += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 
 include(../../common/linux.conf)
diff --git a/mkspecs/unsupported/qnx-X11-g++/qmake.conf b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
index 6a3ad1f2a8..a5ee0b0e56 100644
--- a/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+++ b/mkspecs/unsupported/qnx-X11-g++/qmake.conf
@@ -6,7 +6,6 @@
 
 MAKEFILE_GENERATOR	= UNIX
 QMAKE_PLATFORM = qnx
-CONFIG			+= qt warn_on release link_prl
 
 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 897ccd631c..7576b76ceb 100644
--- a/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR  = UNIX
 QMAKE_PLATFORM      = vxworks
-CONFIG             += qt warn_on release incremental link_prl
+CONFIG             += incremental
 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 cdac7b3457..e659639ae4 100644
--- a/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR  = UNIX
 QMAKE_PLATFORM      = vxworks
-CONFIG             += qt warn_on release incremental link_prl
+CONFIG             += incremental
 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 27198266f5..3cf7decf78 100644
--- a/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR  = UNIX
 QMAKE_PLATFORM      = vxworks
-CONFIG             += qt warn_on release incremental link_prl
+CONFIG             += incremental
 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 f8ee4df6bc..3adfd1089e 100644
--- a/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
+++ b/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
@@ -4,7 +4,7 @@
 
 MAKEFILE_GENERATOR  = UNIX
 QMAKE_PLATFORM      = vxworks
-CONFIG             += qt warn_on release incremental link_prl
+CONFIG             += incremental
 QMAKE_INCREMENTAL_STYLE = sublib
 DEFINES            += VXWORKS
 
diff --git a/mkspecs/unsupported/win32-msvc2003/qmake.conf b/mkspecs/unsupported/win32-msvc2003/qmake.conf
index cf55ee044a..ba85427f2b 100644
--- a/mkspecs/unsupported/win32-msvc2003/qmake.conf
+++ b/mkspecs/unsupported/win32-msvc2003/qmake.conf
@@ -6,7 +6,7 @@
 
 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
+CONFIG                  += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target
 DEFINES                 += UNICODE WIN32
 QMAKE_COMPILER_DEFINES  += _MSC_VER=1310 WIN32