diff options
| author | Jonas Rabbe <jonas.rabbe@nokia.com> | 2011-10-11 15:25:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 08:58:30 +0200 |
| commit | 48d95f0baac39fc5eb38a137a8e84eda2cdb2b79 (patch) | |
| tree | 038a66510f91527c70a5fc416238484842a514c1 /src/plugins/plugins.pro | |
| parent | 126addddb5e5a1928a8decf84e9e20655ac24f8d (diff) | |
| download | qtmultimedia-48d95f0baac39fc5eb38a137a8e84eda2cdb2b79.tar.gz | |
Moved general gstreamer helper classes into separate library.
Cleaned up configuration of gstreamer with a separate config
test.
Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379
Reviewed-on: http://codereview.qt-project.org/6459
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 67cc6b701..09b9461ea 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -20,15 +20,8 @@ win32 { simulator: SUBDIRS += simulator unix:!mac { - TMP_GST_LIBS = \ - gstreamer-0.10 >= 0.10.19 \ - gstreamer-base-0.10 >= 0.10.19 \ - gstreamer-interfaces-0.10 >= 0.10.19 \ - gstreamer-audio-0.10 >= 0.10.19 \ - gstreamer-video-0.10 >= 0.10.19 - - system(pkg-config --exists \'$${TMP_GST_LIBS}\' --print-errors): { - SUBDIRS += gstreamer + contains(config_test_gstreamer, yes) { + SUBDIRS += gstreamer } else { SUBDIRS += audiocapture } |