diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-03 15:38:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-08 13:36:20 +0200 |
| commit | 6a3a234742e4f186dd065e48cb013036d5f7a621 (patch) | |
| tree | 8e7132488afa40cbf2386467abee86303e3e031b /mkspecs/common | |
| parent | 809bc47fad9129b9e2ccd13432299db171d79e1a (diff) | |
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>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/ios.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/linux-android.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-armv7le.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/qcc-base-qnx-x86.conf | 1 | ||||
| -rw-r--r-- | mkspecs/common/wince/qmake.conf | 2 |
5 files changed, 2 insertions, 5 deletions
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 |