remove some unnecessary CONFIG additions

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

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

examples/multimedia/audiodecoder/audiodecoder.pro

@@ -1,8 +1,6 @@
 TEMPLATE = app
 TARGET = audiodecoder
 
-CONFIG += qt warn_on
-
 HEADERS = \
     audiodecoder.h \
     wavefilewriter.h

src/multimediawidgets/multimediawidgets.pro

@@ -7,8 +7,6 @@ contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2) {
    DEFINES += QT_NO_OPENGL
 }
 
-CONFIG += no_private_qt_headers_warning
-
 load(qt_module)
 
 PRIVATE_HEADERS += \

src/plugins/blackberry/mediaservice/mediaservice.pro

@@ -1,6 +1,5 @@
 TARGET = qtmedia_blackberry
 QT += multimedia-private gui-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
 PLUGIN_CLASS_NAME = BbServicePlugin

tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qaudiodecoderbackend
 
 QT += multimedia multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test

tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qaudiodeviceinfo
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test

tests/auto/integration/qaudioinput/qaudioinput.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qaudioinput
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test

tests/auto/integration/qaudiooutput/qaudiooutput.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qaudiooutput
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase

tests/auto/integration/qcamerabackend/qcamerabackend.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qcamerabackend
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase

tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qdeclarativevideooutput
 
 QT += multimedia-private qml testlib quick
-CONFIG += no_private_qt_headers_warning
 CONFIG += testcase
 
 OTHER_FILES += \

tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qdeclarativevideooutput_window
 
 QT += multimedia-private qml testlib quick
-CONFIG += no_private_qt_headers_warning
 CONFIG += testcase
 
 OTHER_FILES += \

tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qmediaplayerbackend
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase insignificant_test

tests/auto/integration/qml/qml.pro

@@ -1,6 +1,6 @@
 TEMPLATE=app
 TARGET=tst_qml
-CONFIG += warn_on qmltestcase
+CONFIG += qmltestcase
 SOURCES += tst_qml.cpp
 
 

tests/auto/integration/qsound/qsound.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qsound
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase

tests/auto/integration/qsoundeffect/qsoundeffect.pro

@@ -1,7 +1,6 @@
 TARGET = tst_qsoundeffect
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 # This is more of a system test
 CONFIG += testcase

tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qabstractvideobuffer
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideobuffer.cpp
 

tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qabstractvideosurface
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qabstractvideosurface.cpp
 

tests/auto/unit/qaudioformat/qaudioformat.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qaudioformat
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudioformat.cpp
 

tests/auto/unit/qaudionamespace/qaudionamespace.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qaudionamespace
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qaudionamespace.cpp
 

tests/auto/unit/qcamera/qcamera.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcamera
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)

tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcameraimagecapture
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qcameraimagecapture.cpp

tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcameraviewfinder
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)

tests/auto/unit/qcamerawidgets/qcamerawidgets.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qcamerawidgets
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 include (../qmultimedia_common/mock.pri)
 include (../qmultimedia_common/mockcamera.pri)

tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qdeclarativeaudio
 
 QT += multimedia-private qml testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
         ../../../../src/imports/multimedia/qdeclarativeaudio_p.h \

tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qdeclarativevideo
 
 QT += multimedia-private qml testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
         ../../../../src/imports/multimedia/qdeclarativevideo_p.h \

tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qgraphicsvideoitem
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qgraphicsvideoitem.cpp
 

tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediabindableinterface
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qmediabindableinterface.cpp

tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediacontainercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontainercontrol.cpp
 

tests/auto/unit/qmediacontent/qmediacontent.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediacontent
 
 QT += multimedia-private network testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediacontent.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaplaylist/qmediaplaylist.pro

@@ -4,7 +4,6 @@ TARGET = tst_qmediaplaylist
 include (../qmultimedia_common/mockplaylist.pri)
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 HEADERS += \
     ../../../../src/plugins/m3u/qm3uhandler.h

tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaplaylistnavigator
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaplaylistnavigator.cpp
 

tests/auto/unit/qmediapluginloader/qmediapluginloader.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediapluginloader
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediapluginloader.cpp
 

tests/auto/unit/qmediaresource/qmediaresource.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaresource
 
 QT += network multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaresource.cpp
 

tests/auto/unit/qmediaservice/qmediaservice.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediaservice
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediaservice.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro

@@ -1,6 +1,5 @@
 TARGET = mockserviceplugin1
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin1

tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro

@@ -1,6 +1,5 @@
 TARGET = mockserviceplugin2
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin2

tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro

@@ -1,6 +1,5 @@
 TARGET = mockserviceplugin3
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin3

tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro

@@ -1,6 +1,5 @@
 TARGET = mockserviceplugin4
 QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
 
 PLUGIN_TYPE=mediaservice
 PLUGIN_CLASS_NAME = MockServicePlugin4

tests/auto/unit/qmediaserviceprovider/test/test.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = ../tst_qmediaserviceprovider
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += ../tst_qmediaserviceprovider.cpp
 

tests/auto/unit/qmediatimerange/qmediatimerange.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmediatimerange
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmediatimerange.cpp
 

tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmetadatareadercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatareadercontrol.cpp
 

tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qmetadatawritercontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qmetadatawritercontrol.cpp
 

tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qpaintervideosurface
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    QT += opengl
 } else {

tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideoencodersettingscontrol
 
 QT += multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += \
     tst_qvideoencodersettingscontrol.cpp

tests/auto/unit/qvideoframe/qvideoframe.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideoframe
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideoframe.cpp
 

tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideosurfaceformat
 
 QT += core multimedia-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideosurfaceformat.cpp
 

tests/auto/unit/qvideowidget/qvideowidget.pro

@@ -2,7 +2,6 @@ CONFIG += testcase
 TARGET = tst_qvideowidget
 
 QT += multimedia-private multimediawidgets-private testlib
-CONFIG += no_private_qt_headers_warning
 
 SOURCES += tst_qvideowidget.cpp