summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2012-09-03 12:10:27 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-12 12:37:43 +0200
commit83b79659b6c75a08b0d7f303ad47c63b3fb5aee2 (patch)
treed905603f3052579fcf50d19004887289a25df956
parent1450569eb1789985f67d29ee2cf1cafc3612854b (diff)
centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
-rw-r--r--.qmake.conf1
-rw-r--r--src/multimedia/multimedia.pro2
-rw-r--r--src/multimediawidgets/multimediawidgets.pro2
-rw-r--r--src/plugins/audiocapture/audiocapture.pro2
-rw-r--r--src/plugins/avfoundation/camera/camera.pro2
-rw-r--r--src/plugins/blackberry/blackberry.pro2
-rw-r--r--src/plugins/gstreamer/audiodecoder/audiodecoder.pro2
-rw-r--r--src/plugins/gstreamer/camerabin/camerabin.pro2
-rw-r--r--src/plugins/gstreamer/mediacapture/mediacapture.pro2
-rw-r--r--src/plugins/gstreamer/mediaplayer/mediaplayer.pro2
-rw-r--r--src/plugins/m3u/m3u.pro2
-rw-r--r--src/plugins/pulseaudio/pulseaudio.pro2
-rw-r--r--src/plugins/qt7/qt7.pro2
-rw-r--r--src/plugins/v4l/v4l.pro2
-rw-r--r--src/plugins/wmf/wmf.pro2
-rw-r--r--src/qtmultimediaquicktools/qtmultimediaquicktools.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro3
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro3
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro3
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro3
20 files changed, 1 insertions, 42 deletions
diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 000000000..42ba8e45f
--- /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 04816b15d..c1739c96c 100644
--- 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 a913cbbd9..502c4ccda 100644
--- 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 6ff7676d6..aef7b5e92 100644
--- 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 7942c0f1b..0ca18c532 100644
--- 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 c783f89df..d5eb8dd04 100644
--- 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 5263c93d4..0e0209007 100644
--- 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 bf81075bc..75c948f40 100644
--- 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 20e1ffa71..d9feb811f 100644
--- 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 3141636b5..eab084394 100644
--- 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 6ef276714..ccf1687d7 100644
--- 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 77726a764..4a37c1a29 100644
--- 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 6c753501b..5b1fcdbc4 100644
--- 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 80112f666..0eb985cc8 100644
--- 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 2292173a5..4dc410ba2 100644
--- 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 af12b08ab..897163694 100644
--- 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 838c0d78b..df237a141 100644
--- 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 4f4da3236..0403f5795 100644
--- 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 52d589b19..51744d35a 100644
--- 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 11b7a6223..f5583884d 100644
--- 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