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>
2012-12-14 19:26:41 +01:00
parent 3bf7a86c07
commit 6fa2f5c4b1
46 changed files with 1 additions and 48 deletions
--- a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
+++ b/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
--- a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
+++ b/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
--- a/tests/auto/integration/qaudioinput/qaudioinput.pro
+++ b/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
--- a/tests/auto/integration/qaudiooutput/qaudiooutput.pro
+++ b/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
--- a/tests/auto/integration/qcamerabackend/qcamerabackend.pro
+++ b/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
--- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
+++ b/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 += \
--- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
+++ b/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 += \
--- a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/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
--- a/tests/auto/integration/qml/qml.pro
+++ b/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


--- a/tests/auto/integration/qsound/qsound.pro
+++ b/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
--- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro
+++ b/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
--- a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
+++ b/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

--- a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
+++ b/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

--- a/tests/auto/unit/qaudioformat/qaudioformat.pro
+++ b/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

--- a/tests/auto/unit/qaudionamespace/qaudionamespace.pro
+++ b/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

--- a/tests/auto/unit/qcamera/qcamera.pro
+++ b/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)
--- a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
+++ b/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
--- a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
+++ b/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)
--- a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
+++ b/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)
--- a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
+++ b/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 \
--- a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
+++ b/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 \
--- a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/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

--- a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
+++ b/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
--- a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
+++ b/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

--- a/tests/auto/unit/qmediacontent/qmediacontent.pro
+++ b/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
--- a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
+++ b/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
--- a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
+++ b/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

--- a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
+++ b/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

--- a/tests/auto/unit/qmediaresource/qmediaresource.pro
+++ b/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

--- a/tests/auto/unit/qmediaservice/qmediaservice.pro
+++ b/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
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/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
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/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
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/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
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/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
--- a/tests/auto/unit/qmediaserviceprovider/test/test.pro
+++ b/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

--- a/tests/auto/unit/qmediatimerange/qmediatimerange.pro
+++ b/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

--- a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
+++ b/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

--- a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
+++ b/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

--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/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 {
--- a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
+++ b/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
--- a/tests/auto/unit/qvideoframe/qvideoframe.pro
+++ b/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

--- a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
+++ b/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

--- a/tests/auto/unit/qvideowidget/qvideowidget.pro
+++ b/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