diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-22 19:17:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-25 11:44:40 +0200 |
| commit | b1a4d7f9fcada18199e25f0f3ac6cebe8616da07 (patch) | |
| tree | 7a6966ff6611152e4d7b22ca5ebeb73ed8bbe88d /src/plugins | |
| parent | 631f3ab025fca83fcf578f035ed49ef9b288e9de (diff) | |
build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- pointless DEFINES+=QT_MAKEDLL
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/audiocapture/audiocapture.pro | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/directshow.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/mediacapture/mediacapture.pro | 2 | ||||
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 2 | ||||
| -rw-r--r-- | src/plugins/m3u/m3u.pro | 2 | ||||
| -rw-r--r-- | src/plugins/pulseaudio/pulseaudio.pro | 2 | ||||
| -rw-r--r-- | src/plugins/qt7/qt7.pro | 2 | ||||
| -rw-r--r-- | src/plugins/v4l/v4l.pro | 2 | ||||
| -rw-r--r-- | src/plugins/wmf/wmf.pro | 4 |
11 files changed, 10 insertions, 14 deletions
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index 3e2015bf9..6a4a5888a 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_audioengine QT += multimedia-private diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index 02af790c2..61476476e 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -7,8 +7,6 @@ PLUGIN_TYPE=mediaservice QT += multimedia -DEPENDPATH += . - HEADERS += dsserviceplugin.h SOURCES += dsserviceplugin.cpp diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index a0dfcafec..5263c93d4 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,4 +1,4 @@ -load(qt_module) +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 f79c625cd..6c0c1bf1c 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -1,4 +1,4 @@ -load(qt_module) +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 f0e984f46..20e1ffa71 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,4 +1,4 @@ -load(qt_module) +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 82980b397..3141636b5 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = gstmediaplayer PLUGIN_TYPE = mediaservice diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index 98d16c777..6ef276714 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmultimedia_m3u QT += multimedia-private diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index 0a922aa16..77726a764 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_pulse QT += multimedia-private diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 2c324e02c..6c753501b 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -1,4 +1,4 @@ -load(qt_module) +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 bc5c3d4a0..80112f666 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = qtmedia_v4lengine QT += multimedia-private diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index 9da545aec..8daabf582 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -1,4 +1,4 @@ -load(qt_module) +load(qt_build_config) TARGET = wmfengine QT += multimedia-private network @@ -12,8 +12,6 @@ load(qt_plugin) DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} -DEPENDPATH += . - HEADERS += wmfserviceplugin.h SOURCES += wmfserviceplugin.cpp |