remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

Change-Id: I0f6429ef61b73b9d57b9f1fc08b789d39e5b99c0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/src/assistant/clucene/clucene.pro b/src/assistant/clucene/clucene.pro
index 63c2e32..49bdb9d 100644 (file)
--- a/src/assistant/clucene/clucene.pro
+++ b/src/assistant/clucene/clucene.pro
@@ -8,7 +8,7 @@ load(qt_module)
 
 include(fulltextsearch.pri)
 
-CONFIG += qt warn_off
+CONFIG += warn_off
 contains(QT_CONFIG, reduce_exports) {
     CONFIG += hide_symbols
     # workaround for compiler errors on Ubuntu

diff --git a/src/assistant/qhelpconverter/qhelpconverter.pro b/src/assistant/qhelpconverter/qhelpconverter.pro
index 33c2529..8c8adfe 100644 (file)
--- a/src/assistant/qhelpconverter/qhelpconverter.pro
+++ b/src/assistant/qhelpconverter/qhelpconverter.pro
@@ -2,7 +2,6 @@ QT += help widgets
 TEMPLATE = app
 TARGET = qhelpconverter
 DESTDIR = $$QT.help.bins
-CONFIG += qt warn_on
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 
 target.path=$$[QT_INSTALL_BINS]

diff --git a/src/designer/designer.pro b/src/designer/designer.pro
index 721c4fc..be734fb 100644 (file)
--- a/src/designer/designer.pro
+++ b/src/designer/designer.pro
@@ -1,5 +1,3 @@
 TEMPLATE = subdirs
 
-CONFIG += qt
-
 SUBDIRS = src

diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro
index f2ad648..795bd10 100644 (file)
--- a/src/linguist/linguist/linguist.pro
+++ b/src/linguist/linguist/linguist.pro
@@ -5,8 +5,6 @@ DESTDIR = $$QT.designer.bins
 QT += core-private widgets xml uitools-private
 !isEmpty(QT.printsupport.name): QT += printsupport
 
-CONFIG += qt warn_on
-
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 

diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro
index 2f0d4d7..d6dc6a2 100644 (file)
--- a/src/pixeltool/pixeltool.pro
+++ b/src/pixeltool/pixeltool.pro
@@ -1,4 +1,3 @@
-CONFIG  += qt warn_on
 !build_pass:contains(QT_CONFIG, build_all): CONFIG += release
 QT += widgets network
 

diff --git a/src/qconfig/qconfig.pro b/src/qconfig/qconfig.pro
index 026bd2f..3e9c120 100644 (file)
--- a/src/qconfig/qconfig.pro
+++ b/src/qconfig/qconfig.pro
@@ -1,5 +1,4 @@
 TEMPLATE       = app
-CONFIG         += qt warn_on
 QT += widgets
 build_all:!build_pass {
     CONFIG -= build_all

diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro
index c5a6b6f..e600594 100644 (file)
--- a/src/qtconfig/qtconfig.pro
+++ b/src/qtconfig/qtconfig.pro
@@ -1,5 +1,5 @@
 TEMPLATE = app
-CONFIG   += qt warn_on x11
+CONFIG   += x11
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release

diff --git a/src/qtestlib/wince/cetest/cetest.pro b/src/qtestlib/wince/cetest/cetest.pro
index 571a415..a31aa2e 100644 (file)
--- a/src/qtestlib/wince/cetest/cetest.pro
+++ b/src/qtestlib/wince/cetest/cetest.pro
@@ -6,7 +6,7 @@ build_all:!build_pass {
     CONFIG += release
 }
 
-CONFIG += console no_batch depend_includepath
+CONFIG += console no_batch
 CONFIG -= qt
 
 DEFINES        += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT_NO_LIBRARY \