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>

diff --git a/examples/multimedia/audiodecoder/audiodecoder.pro b/examples/multimedia/audiodecoder/audiodecoder.pro
index 0a09c3c..4cfb313 100644 (file)
--- a/examples/multimedia/audiodecoder/audiodecoder.pro
+++ b/examples/multimedia/audiodecoder/audiodecoder.pro
@@ -1,8 +1,6 @@
 TEMPLATE = app
 TARGET = audiodecoder
 
-CONFIG += qt warn_on
-
 HEADERS = \
     audiodecoder.h \
     wavefilewriter.h

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index 502c4cc..d0638dd 100644 (file)
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/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 += \

diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro
index 3a713ee..ffaed48 100644 (file)
--- a/src/plugins/blackberry/mediaservice/mediaservice.pro
+++ b/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

diff --git a/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro b/tests/auto/integration/qaudiodecoderbackend/qaudiodecoderbackend.pro
index f15ee44..80ce0c1 100644 (file)
--- 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

diff --git a/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro b/tests/auto/integration/qaudiodeviceinfo/qaudiodeviceinfo.pro
index 387a141..69bd792 100644 (file)
--- 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

diff --git a/tests/auto/integration/qaudioinput/qaudioinput.pro b/tests/auto/integration/qaudioinput/qaudioinput.pro
index bd8ea78..a3e0ad3 100644 (file)
--- 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

diff --git a/tests/auto/integration/qaudiooutput/qaudiooutput.pro b/tests/auto/integration/qaudiooutput/qaudiooutput.pro
index 62f5063..5933e73 100644 (file)
--- 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

diff --git a/tests/auto/integration/qcamerabackend/qcamerabackend.pro b/tests/auto/integration/qcamerabackend/qcamerabackend.pro
index 2d3550c..50da92f 100644 (file)
--- 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

diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro
index 16a8528..b9be929 100644 (file)
--- 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 += \

diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro
index ba7743e..3cc5e09 100644 (file)
--- 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 += \

diff --git a/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/integration/qmediaplayerbackend/qmediaplayerbackend.pro
index 7dc62b6..79028d8 100644 (file)
--- 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

diff --git a/tests/auto/integration/qml/qml.pro b/tests/auto/integration/qml/qml.pro
index 63dd095..cd02af6 100644 (file)
--- 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
 
 

diff --git a/tests/auto/integration/qsound/qsound.pro b/tests/auto/integration/qsound/qsound.pro
index 0a0ed09..e2d4434 100644 (file)
--- 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

diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro
index 2fffaf7..cb186db 100644 (file)
--- 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

diff --git a/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro b/tests/auto/unit/qabstractvideobuffer/qabstractvideobuffer.pro
index 22cf714..dc44935 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro b/tests/auto/unit/qabstractvideosurface/qabstractvideosurface.pro
index 4d8f9f1..62e4c60 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qaudioformat/qaudioformat.pro b/tests/auto/unit/qaudioformat/qaudioformat.pro
index b9edca0..40ef06b 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qaudionamespace/qaudionamespace.pro b/tests/auto/unit/qaudionamespace/qaudionamespace.pro
index 40b8107..78e99dd 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qcamera/qcamera.pro b/tests/auto/unit/qcamera/qcamera.pro
index 1e10098..1f31c7f 100644 (file)
--- 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)

diff --git a/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro b/tests/auto/unit/qcameraimagecapture/qcameraimagecapture.pro
index 1a8e66a..e6b43e1 100644 (file)
--- 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

diff --git a/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro b/tests/auto/unit/qcameraviewfinder/qcameraviewfinder.pro
index 3c2b4bb..6f6aba0 100644 (file)
--- 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)

diff --git a/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro b/tests/auto/unit/qcamerawidgets/qcamerawidgets.pro
index adaed0b..dbab97a 100644 (file)
--- 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)

diff --git a/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro b/tests/auto/unit/qdeclarativeaudio/qdeclarativeaudio.pro
index 37c5fd3..6471f7b 100644 (file)
--- 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 \

diff --git a/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro b/tests/auto/unit/qdeclarativevideo/qdeclarativevideo.pro
index 2ab722c..2394855 100644 (file)
--- 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 \

diff --git a/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/unit/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 81fa546..ebbac5b 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro b/tests/auto/unit/qmediabindableinterface/qmediabindableinterface.pro
index 882bd2e..0e269c1 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro b/tests/auto/unit/qmediacontainercontrol/qmediacontainercontrol.pro
index 300d8f5..32b6276 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediacontent/qmediacontent.pro b/tests/auto/unit/qmediacontent/qmediacontent.pro
index c42093a..56e0e05 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro b/tests/auto/unit/qmediaplaylist/qmediaplaylist.pro
index ed54c47..97dba93 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro b/tests/auto/unit/qmediaplaylistnavigator/qmediaplaylistnavigator.pro
index 07cc327..84bbddb 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro b/tests/auto/unit/qmediapluginloader/qmediapluginloader.pro
index 6c8bd81..36351ce 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediaresource/qmediaresource.pro b/tests/auto/unit/qmediaresource/qmediaresource.pro
index ea75d9d..dcc0bff 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediaservice/qmediaservice.pro b/tests/auto/unit/qmediaservice/qmediaservice.pro
index fe6481d..bdf49b7 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 843574e..68dee28 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 41380f7..98a3ca4 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 0e5ff0b..50def29 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 3e83ac9..57b715f 100644 (file)
--- 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

diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro
index c1d584a..38b6feb 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmediatimerange/qmediatimerange.pro b/tests/auto/unit/qmediatimerange/qmediatimerange.pro
index 84bb2f5..69af820 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro b/tests/auto/unit/qmetadatareadercontrol/qmetadatareadercontrol.pro
index e7ff03f..44eaf7e 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro b/tests/auto/unit/qmetadatawritercontrol/qmetadatawritercontrol.pro
index 9101171..70ca1eb 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 1098dd1..4408c4f 100644 (file)
--- 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 {

diff --git a/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro b/tests/auto/unit/qvideoencodersettingscontrol/qvideoencodersettingscontrol.pro
index f6c568d..58800ee 100644 (file)
--- 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

diff --git a/tests/auto/unit/qvideoframe/qvideoframe.pro b/tests/auto/unit/qvideoframe/qvideoframe.pro
index 7df5b05..1e2baa5 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro b/tests/auto/unit/qvideosurfaceformat/qvideosurfaceformat.pro
index e923e60..a5c627a 100644 (file)
--- 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
 

diff --git a/tests/auto/unit/qvideowidget/qvideowidget.pro b/tests/auto/unit/qvideowidget/qvideowidget.pro
index e9c1b25..efeb91d 100644 (file)
--- 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