centralize load(qt_build_config)s in .qmake.conf

Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-03 12:10:27 +02:00
parent 1450569eb1
commit 83b79659b6
20 changed files with 1 additions and 42 deletions
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -0,0 +1 @@
+load(qt_build_config)
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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
--- 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) {
--- 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
--- 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
--- 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
--- 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
--- 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