diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-14 19:17:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 14:08:17 +0100 |
| commit | 09331062bb705e5778f346b701a38454905ec1e0 (patch) | |
| tree | b8d40c24d41a28ce6278ab9e4cbcfdc98b78d030 /mkspecs/features | |
| parent | dcfa8926ff4b4db2290d819420c29480dab611b1 (diff) | |
remove some unnecessary CONFIG additions
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.
Change-Id: Ic00e0ba496d698ed9659c476f2ca99fc0f86a093
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_tool.prf | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 4323910e4a..b06b9d6cfc 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -4,6 +4,6 @@ load(exclusive_builds) CONFIG = \ - lex yacc warn_on debug exceptions depend_includepath \ + lex yacc debug exceptions depend_includepath \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index cb799711c9..159733e02e 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -111,7 +111,6 @@ TEMPLATE = lib DESTDIR = $$eval(QT.$${MODULE}.libs) win32:!wince*:exists($$[QT_INSTALL_PREFIX]/.qmake.cache): DLLDESTDIR = $$eval(QT.$${MODULE}.bins) -CONFIG += qt warn_on depend_includepath CONFIG += qmake_cache target_qt QMAKE_DOCS_TARGETDIR = qt$${MODULE} diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index f665479795..16db6c7972 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -14,7 +14,7 @@ TEMPLATE = app load(qt_build_paths) DESTDIR = $$MODULE_BASE_OUTDIR/bin -CONFIG += qt warn_on console +CONFIG += console isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle host_build { |