remove some unnecessary CONFIG additions

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

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

13 files changed, 10 insertions, 14 deletions

diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro
index 6f8cb37f93..d86df72962 100644
--- a/examples/qml/plugins/plugins.pro
+++ b/examples/qml/plugins/plugins.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR = imports/TimeExample
diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro
index 8f94a0cecd..77e4d146e1 100644
--- a/examples/quick/customitems/painteditem/painteditem.pro
+++ b/examples/quick/customitems/painteditem/painteditem.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml quick
 
 TARGET = qmltextballoonplugin
diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro
index 8f3e5d2d73..5567a2d6d9 100644
--- a/examples/quick/imageprovider/imageprovider.pro
+++ b/examples/quick/imageprovider/imageprovider.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml quick
 
 DESTDIR = ImageProviderCore
diff --git a/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index c84b6fe7ff..6bf44b4d15 100644
--- a/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml quick
 
 DESTDIR = Charts
diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
index 36d88588e4..da06975e3b 100644
--- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR +=  ../plugins
diff --git a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
index 71abddc7e3..b3659d2b58 100644
--- a/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro
@@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += qt plugin
+CONFIG += plugin
 QT += qml
 
 DESTDIR +=  ../plugins
diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro
index 6df7ce8849..e62decb733 100644
--- a/examples/quick/window/window/window.pro
+++ b/examples/quick/window/window/window.pro
@@ -1,5 +1,4 @@
 TEMPLATE = app
-CONFIG += qt
 QT += qml
 
 SOURCES += window.cpp
diff --git a/src/particles/particles.pro b/src/particles/particles.pro
index de855faf8a..632856ccca 100644
--- a/src/particles/particles.pro
+++ b/src/particles/particles.pro
@@ -1,6 +1,6 @@
 TARGET = QtQuickParticles
 
-CONFIG += dll warn_on internal_module
+CONFIG += internal_module
 
 QT = core-private gui-private qml-private quick-private
 QT_PRIVATE = v8-private
diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
index 3fa9561a9d..8864f1cae1 100644
--- a/src/qmltest/qmltest.pro
+++ b/src/qmltest/qmltest.pro
@@ -1,5 +1,4 @@
 TARGET     = QtQuickTest
-CONFIG += dll warn_on
 
 DEFINES += QT_NO_URL_CAST_FROM_STRING
 QT = core
diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 3eece29152..c4fceac33d 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -1,7 +1,5 @@
 TARGET = QtQuick
 
-CONFIG += dll warn_on
-
 QT = core-private gui-private qml-private
 QT_PRIVATE = v8-private network
 
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index 7c95104eed..0a7967654c 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -1,6 +1,6 @@
 TEMPLATE=app
 TARGET=tst_qmltest
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qmltest.cpp
 
 
diff --git a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
index c71903a195..b5e03ee620 100644
--- a/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
+++ b/tests/auto/quick/qquickanimationcontroller/qquickanimationcontroller.pro
@@ -2,7 +2,7 @@ QT += core-private gui-private qml-private
 TEMPLATE=app
 TARGET=tst_qquickanimationcontroller
 
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 CONFIG += parallel_test
 SOURCES += tst_qquickanimationcontroller.cpp
 
diff --git a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
index 01c3a5eb02..a164de735a 100644
--- a/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
+++ b/tests/auto/quick/qquickcanvasitem/qquickcanvasitem.pro
@@ -2,7 +2,7 @@ QT += core-private gui-private qml-private
 TEMPLATE=app
 TARGET=tst_qquickcanvasitem
 
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qquickcanvasitem.cpp
 
 TESTDATA = data/*