centralize load(qt_build_config)s in .qmake.conf

Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644 (file)
index 0000000..42ba8e4
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1 @@
+load(qt_build_config)

diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 04816b1..c1739c9 100644 (file)
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = QtMultimedia
 QT = core-private network gui
 

diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index a913cbb..502c4cc 100644 (file)
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 # distinct from QtMultimedia
 TARGET = QtMultimediaWidgets
 QT = core gui multimedia-private widgets-private

diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro
index 6ff7676..aef7b5e 100644 (file)
--- a/src/plugins/audiocapture/audiocapture.pro
+++ b/src/plugins/audiocapture/audiocapture.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = qtmedia_audioengine
 QT += multimedia-private
 PLUGIN_TYPE=mediaservice

diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index 7942c0f..0ca18c5 100644 (file)
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 # Avoid clash with a variable named `slots' in a Quartz header
 CONFIG += no_keywords
 

diff --git a/src/plugins/blackberry/blackberry.pro b/src/plugins/blackberry/blackberry.pro
index c783f89..d5eb8dd 100644 (file)
--- a/src/plugins/blackberry/blackberry.pro
+++ b/src/plugins/blackberry/blackberry.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = qtmedia_blackberry
 QT += multimedia-private gui-private
 CONFIG += no_private_qt_headers_warning

diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
index 5263c93..0e02090 100644 (file)
--- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
+++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = gstaudiodecoder
 PLUGIN_TYPE = mediaservice
 

diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
index bf81075..75c948f 100644 (file)
--- a/src/plugins/gstreamer/camerabin/camerabin.pro
+++ b/src/plugins/gstreamer/camerabin/camerabin.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = gstcamerabin
 PLUGIN_TYPE = mediaservice
 

diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro
index 20e1ffa..d9feb81 100644 (file)
--- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
+++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = gstmediacapture
 PLUGIN_TYPE = mediaservice
 

diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
index 3141636..eab0843 100644 (file)
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
+++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = gstmediaplayer
 PLUGIN_TYPE = mediaservice
 

diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro
index 6ef2767..ccf1687 100644 (file)
--- a/src/plugins/m3u/m3u.pro
+++ b/src/plugins/m3u/m3u.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = qtmultimedia_m3u
 QT += multimedia-private
 PLUGIN_TYPE=playlistformats

diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index 77726a7..4a37c1a 100644 (file)
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = qtmedia_pulse
 QT += multimedia-private
 PLUGIN_TYPE = audio

diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro
index 6c75350..5b1fcdb 100644 (file)
--- a/src/plugins/qt7/qt7.pro
+++ b/src/plugins/qt7/qt7.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 # Avoid clash with a variable named `slots' in a Quartz header
 CONFIG += no_keywords
 

diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro
index 80112f6..0eb985c 100644 (file)
--- a/src/plugins/v4l/v4l.pro
+++ b/src/plugins/v4l/v4l.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = qtmedia_v4lengine
 QT += multimedia-private
 PLUGIN_TYPE = mediaservice

diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 2292173..4dc410b 100644 (file)
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = wmfengine
 QT += multimedia-private network
 !isEmpty(QT.widgets.name) {

diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
index af12b08..8971636 100644 (file)
--- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
+++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
@@ -1,5 +1,3 @@
-load(qt_build_config)
-
 TARGET = QtMultimediaQuick_p
 QT = core quick multimedia-private
 CONFIG += internal_module

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 838c0d7..df237a1 100644 (file)
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,6 +1,3 @@
-
-load(qt_build_config)
-
 TARGET = mockserviceplugin1
 QT += multimedia-private
 CONFIG += no_private_qt_headers_warning

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 4f4da32..0403f57 100644 (file)
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,6 +1,3 @@
-
-load(qt_build_config)
-
 TARGET = mockserviceplugin2
 QT += multimedia-private
 CONFIG += no_private_qt_headers_warning

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 52d589b..51744d3 100644 (file)
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,6 +1,3 @@
-
-load(qt_build_config)
-
 TARGET = mockserviceplugin3
 QT += multimedia-private
 CONFIG += no_private_qt_headers_warning

diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 11b7a62..f558388 100644 (file)
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,6 +1,3 @@
-
-load(qt_build_config)
-
 TARGET = mockserviceplugin4
 QT += multimedia-private
 CONFIG += no_private_qt_headers_warning