diff options
92 files changed, 62 insertions, 91 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index fefcec28de..c52a55437d 100644 --- 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 index 6c6efa0fab..353e1ba334 100644 --- 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 index 7b774089eb..0fc0266746 100644 --- 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 index f8de99f542..59c067c0f9 100644 --- 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 index 53b8f30691..7420b56daf 100644 --- 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 index eef0166b6b..7bf4082142 100644 --- 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 index dd92b2d710..9bd9e288d3 100644 --- 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 index 840c490f9e..a2803a5c5a 100644 --- 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 index 1c280f0a01..236e445089 100644 --- 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 index 31a9b92800..0464699e42 100644 --- 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 index fe732c0fa4..4b8ed77f03 100644 --- 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 index a62f869c5f..ef9280b1f6 100644 --- 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 index 29d0132adb..a480d072cc 100644 --- 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 index a6356e3c03..afc0814907 100644 --- 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 index 9f5032e2f9..21751453cb 100644 --- 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 index 2b6c77ca9e..fd5b0b3ca2 100644 --- 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 index 0138e37860..b23419f64b 100644 --- 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 index d9170009a5..0a580a9fc2 100644 --- 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 index 0453dca8e1..d0cf2b8655 100644 --- 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 index 4a92cb850d..83f54c38b6 100644 --- 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 index 82af66ecfc..b0f6129aa7 100644 --- 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 index 7a7c626894..14e3ac90de 100644 --- 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 index 79b0af5bbb..9e95a3e2c6 100644 --- 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 index 7f6313a2aa..bddc196811 100644 --- 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 index 9e56aa61e9..54566de5fb 100644 --- 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 index d93bf25cbf..22b855423e 100644 --- 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 index 009e33c66d..1f3c862adc 100644 --- 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 index c584e63323..6d81fe55bc 100644 --- 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 index 6abdca8e01..837a199485 100644 --- 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 index 918a972227..99c899fb30 100644 --- 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 index 0ad27a75ca..7222e880bc 100644 --- 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 index 74ced51bf9..0e938ea358 100644 --- 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 index 0c137d8fd2..81b1101d0a 100644 --- 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 index 8c0be55adc..c6ca94bfcf 100644 --- 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 index e9afaa969a..0fe3188ecd 100644 --- 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 index 1db0e4fc68..0e0582e628 100644 --- 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 index a654d7af3d..4ef6d62291 100644 --- 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 index 0d292fe647..c8317ddad7 100644 --- 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 index c9ab4a832f..574faa7456 100644 --- 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 index 1ba922cf49..77d913f8a5 100644 --- 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 index 824a07eade..517ba00fa6 100644 --- 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 index 373faee2cf..16cd6e3839 100644 --- 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 index 9c6af8f469..ffbccec6d0 100644 --- 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 index 66b30ccaf1..9e9c37ac56 100644 --- 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 index be655ed9e8..c1dc7c4c73 100644 --- 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 index 51ba383946..9c1e0d7ab1 100644 --- 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) diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index e412f81e93..0df0b0af9c 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release link_prl gdb_dwarf_index +CONFIG += gdb_dwarf_index QMAKE_CC = icc QMAKE_LEX = flex diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf index a4661ce014..54625efbc3 100644 --- a/mkspecs/linux-kcc/qmake.conf +++ b/mkspecs/linux-kcc/qmake.conf @@ -15,7 +15,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux -CONFIG += qt warn_on release link_prl QMAKE_CC = KCC QMAKE_LEX = flex diff --git a/mkspecs/linux-llvm/qmake.conf b/mkspecs/linux-llvm/qmake.conf index 5b1217b49f..3b7034d1b6 100644 --- a/mkspecs/linux-llvm/qmake.conf +++ b/mkspecs/linux-llvm/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-lsb-g++/qmake.conf b/mkspecs/linux-lsb-g++/qmake.conf index 8ef7475b33..72d6a920fb 100644 --- a/mkspecs/linux-lsb-g++/qmake.conf +++ b/mkspecs/linux-lsb-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-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf index 2c2e8c2dec..a5f5a04a91 100644 --- a/mkspecs/linux-pgcc/qmake.conf +++ b/mkspecs/linux-pgcc/qmake.conf @@ -6,7 +6,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = linux -CONFIG += qt warn_on release link_prl QMAKE_CC = pgcc QMAKE_LEX = flex diff --git a/mkspecs/lynxos-g++/qmake.conf b/mkspecs/lynxos-g++/qmake.conf index bdc109a361..09334489d9 100644 --- a/mkspecs/lynxos-g++/qmake.conf +++ b/mkspecs/lynxos-g++/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = lynxos -CONFIG += qt warn_on release incremental link_prl +CONFIG += incremental QMAKE_INCREMENTAL_STYLE = sublib QMAKE_CC = gcc diff --git a/mkspecs/macx-clang-32/qmake.conf b/mkspecs/macx-clang-32/qmake.conf index f5a7f561b4..2ff6e57994 100644 --- a/mkspecs/macx-clang-32/qmake.conf +++ b/mkspecs/macx-clang-32/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname 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 274f71a030..13ae746df4 100644 --- a/mkspecs/macx-clang-libc++-32/qmake.conf +++ b/mkspecs/macx-clang-libc++-32/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname 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 6323d9ac89..e845147557 100644 --- a/mkspecs/macx-clang-libc++/qmake.conf +++ b/mkspecs/macx-clang-libc++/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/macx-clang/qmake.conf index af5ed2c61b..a063010afc 100644 --- a/mkspecs/macx-clang/qmake.conf +++ b/mkspecs/macx-clang/qmake.conf @@ -3,7 +3,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname 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 0af5ecb8e0..2e6f3c8073 100644 --- a/mkspecs/macx-g++-32/qmake.conf +++ b/mkspecs/macx-g++-32/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) diff --git a/mkspecs/macx-g++/qmake.conf b/mkspecs/macx-g++/qmake.conf index a3273be751..9eacd50dfd 100644 --- a/mkspecs/macx-g++/qmake.conf +++ b/mkspecs/macx-g++/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname 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 9140c27dd3..95c9c75ab1 100644 --- a/mkspecs/macx-g++40/qmake.conf +++ b/mkspecs/macx-g++40/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname 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 09a44d0a2c..c5ce36d00b 100644 --- a/mkspecs/macx-g++42/qmake.conf +++ b/mkspecs/macx-g++42/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) diff --git a/mkspecs/macx-icc/qmake.conf b/mkspecs/macx-icc/qmake.conf index c8ba86399d..6903cc4755 100644 --- a/mkspecs/macx-icc/qmake.conf +++ b/mkspecs/macx-icc/qmake.conf @@ -13,7 +13,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release link_prl app_bundle +CONFIG += app_bundle QMAKE_INCREMENTAL_STYLE = sublibs QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__ diff --git a/mkspecs/macx-llvm/qmake.conf b/mkspecs/macx-llvm/qmake.conf index dd95860b23..2733c82fae 100644 --- a/mkspecs/macx-llvm/qmake.conf +++ b/mkspecs/macx-llvm/qmake.conf @@ -7,7 +7,7 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += qt warn_on release app_bundle incremental global_init_link_order lib_version_first plugin_no_soname link_prl +CONFIG += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname QMAKE_INCREMENTAL_STYLE = sublib include(../common/mac.conf) diff --git a/mkspecs/macx-xcode/qmake.conf b/mkspecs/macx-xcode/qmake.conf index 7d4258dbee..cb342808ec 100644 --- a/mkspecs/macx-xcode/qmake.conf +++ b/mkspecs/macx-xcode/qmake.conf @@ -5,7 +5,7 @@ # MAKEFILE_GENERATOR = XCODE -CONFIG += qt warn_on release lib_version_first incremental plugin_no_soname link_prl app_bundle +CONFIG += lib_version_first incremental plugin_no_soname app_bundle 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 bc5a2c8da4..41dc0abca2 100644 --- a/mkspecs/macx-xlc/qmake.conf +++ b/mkspecs/macx-xlc/qmake.conf @@ -6,7 +6,7 @@ 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 +CONFIG += app_bundle global_init_link_order lib_version_first plugin_no_soname QMAKE_CC = xlc QMAKE_CC_THREAD = xlc_r diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index 0c598b7b1f..914c15216a 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = netbsd bsd -CONFIG += qt warn_on release link_prl gdb_dwarf_index +CONFIG += gdb_dwarf_index QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/openbsd-g++/qmake.conf b/mkspecs/openbsd-g++/qmake.conf index a8015a7a47..be2855862d 100644 --- a/mkspecs/openbsd-g++/qmake.conf +++ b/mkspecs/openbsd-g++/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = openbsd bsd -CONFIG += qt warn_on release link_prl gdb_dwarf_index +CONFIG += gdb_dwarf_index QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/sco-cc/qmake.conf b/mkspecs/sco-cc/qmake.conf index c9d553ec61..4c96847246 100644 --- a/mkspecs/sco-cc/qmake.conf +++ b/mkspecs/sco-cc/qmake.conf @@ -9,7 +9,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = sco -CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex diff --git a/mkspecs/sco-g++/qmake.conf b/mkspecs/sco-g++/qmake.conf index c3ea137680..55073d4193 100644 --- a/mkspecs/sco-g++/qmake.conf +++ b/mkspecs/sco-g++/qmake.conf @@ -6,7 +6,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = sco -CONFIG += qt warn_on release link_prl QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/solaris-cc-64/qmake.conf b/mkspecs/solaris-cc-64/qmake.conf index 196d1be4a4..a3180b8657 100644 --- a/mkspecs/solaris-cc-64/qmake.conf +++ b/mkspecs/solaris-cc-64/qmake.conf @@ -23,7 +23,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris -CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex diff --git a/mkspecs/solaris-cc/qmake.conf b/mkspecs/solaris-cc/qmake.conf index 5f0b4fc106..9f35083eb6 100644 --- a/mkspecs/solaris-cc/qmake.conf +++ b/mkspecs/solaris-cc/qmake.conf @@ -6,7 +6,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris -CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf index 742ef0d73a..605a2d680a 100644 --- a/mkspecs/solaris-g++-64/qmake.conf +++ b/mkspecs/solaris-g++-64/qmake.conf @@ -27,7 +27,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris -CONFIG += qt warn_on release link_prl QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf index a6a81a1513..a4bd6f480d 100644 --- a/mkspecs/solaris-g++/qmake.conf +++ b/mkspecs/solaris-g++/qmake.conf @@ -10,7 +10,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = solaris -CONFIG += qt warn_on release link_prl QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/tru64-cxx/qmake.conf b/mkspecs/tru64-cxx/qmake.conf index c56bca6ac4..5fc8433df3 100644 --- a/mkspecs/tru64-cxx/qmake.conf +++ b/mkspecs/tru64-cxx/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 -CONFIG += qt warn_on release link_prl plugin_no_soname +CONFIG += plugin_no_soname QMAKE_CC = cc QMAKE_LEX = flex diff --git a/mkspecs/tru64-g++/qmake.conf b/mkspecs/tru64-g++/qmake.conf index 20355f491f..e66a428f0a 100644 --- a/mkspecs/tru64-g++/qmake.conf +++ b/mkspecs/tru64-g++/qmake.conf @@ -4,7 +4,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = tru64 -CONFIG += qt warn_on release link_prl plugin_no_soname +CONFIG += plugin_no_soname QMAKE_CC = gcc QMAKE_LEX = flex diff --git a/mkspecs/unixware-cc/qmake.conf b/mkspecs/unixware-cc/qmake.conf index 54c9e925eb..c2e5ea33ce 100644 --- a/mkspecs/unixware-cc/qmake.conf +++ b/mkspecs/unixware-cc/qmake.conf @@ -9,7 +9,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware -CONFIG += qt warn_on release link_prl QMAKE_CC = cc QMAKE_LEX = flex diff --git a/mkspecs/unixware-g++/qmake.conf b/mkspecs/unixware-g++/qmake.conf index 5c00e622f9..3466bf2933 100644 --- a/mkspecs/unixware-g++/qmake.conf +++ b/mkspecs/unixware-g++/qmake.conf @@ -6,7 +6,6 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = unixware -CONFIG += qt warn_on release link_prl QMAKE_CC = gcc QMAKE_LEX = flex 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 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf index a77ea8a54c..067041bfbf 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf @@ -11,7 +11,7 @@ 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 +CONFIG += debug_and_release debug_and_release_target precompile_header DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __GNUC__ WIN32 diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf index b5cb7e383a..2c774ec489 100644 --- a/mkspecs/win32-icc/qmake.conf +++ b/mkspecs/win32-icc/qmake.conf @@ -6,7 +6,7 @@ MAKEFILE_GENERATOR = MSVC.NET QMAKE_PLATFORM = win32 -CONFIG += qt warn_on release incremental flat link_prl debug_and_release debug_and_release_target +CONFIG += incremental flat debug_and_release debug_and_release_target DEFINES += UNICODE QMAKE_COMPILER_DEFINES += __INTEL_COMPILER WIN32 diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf index a38c0ccb0d..4b518f66f8 100644 --- a/mkspecs/win32-msvc2005/qmake.conf +++ b/mkspecs/win32-msvc2005/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 embed_manifest_dll embed_manifest_exe +CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe 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 534d5f4d04..7d3802464a 100644 --- a/mkspecs/win32-msvc2008/qmake.conf +++ b/mkspecs/win32-msvc2008/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 embed_manifest_dll embed_manifest_exe +CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe 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 94ae62683e..62fe007b83 100644 --- a/mkspecs/win32-msvc2010/qmake.conf +++ b/mkspecs/win32-msvc2010/qmake.conf @@ -6,7 +6,7 @@ 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 +CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe 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 4feef12e7f..a8fc08b2a8 100644 --- a/mkspecs/win32-msvc2012/qmake.conf +++ b/mkspecs/win32-msvc2012/qmake.conf @@ -5,7 +5,7 @@ # 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 +CONFIG += incremental flat precompile_header autogen_precompile_source debug_and_release debug_and_release_target embed_manifest_dll embed_manifest_exe DEFINES += UNICODE WIN32 QMAKE_COMPILER_DEFINES += _MSC_VER=1700 WIN32 |