diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-13 16:51:34 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-02-16 16:01:16 +0000 |
commit | df66e8a4ba6d2cf8b245c99dd54877d36fb8561d (patch) | |
tree | 4994d2935afb5f6df96c12e686ed2207037518c6 /qtmultimedia.pro | |
parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) |
Use configured GStreamer version.
The gstreamer version detected or set by the configure script can be
overridden by passing GST_VERSION=<version> to qmake qtmultimedia.pro.
Change-Id: I6f2eac3705d3d6fe0ec8e79042017add6751ee8c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qtmultimedia.pro')
-rw-r--r-- | qtmultimedia.pro | 34 |
1 files changed, 14 insertions, 20 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 84f254861..489589df7 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -17,28 +17,22 @@ win32 { } else { qtCompileTest(alsa) qtCompileTest(pulseaudio) - !done_config_gstreamer { - gstver=0.10 - !isEmpty(GST_VERSION): gstver=$$GST_VERSION - cache(GST_VERSION, set, gstver); - qtCompileTest(gstreamer) { - qtCompileTest(gstreamer_photography) - qtCompileTest(gstreamer_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) - } else { - gstver=1.0 - cache(GST_VERSION, set, gstver); - # Force a re-run of the test - CONFIG -= done_config_gstreamer - qtCompileTest(gstreamer) { - qtCompileTest(gstreamer_photography) - qtCompileTest(gstreamer_encodingprofiles) - qtCompileTest(gstreamer_appsrc) - qtCompileTest(linux_v4l) - } + + isEmpty(GST_VERSION) { + contains(QT_CONFIG, gstreamer-0.10) { + GST_VERSION = 0.10 + } else: contains(QT_CONFIG, gstreamer-1.0) { + GST_VERSION = 1.0 } } + cache(GST_VERSION, set) + !isEmpty(GST_VERSION):qtCompileTest(gstreamer) { + qtCompileTest(gstreamer_photography) + qtCompileTest(gstreamer_encodingprofiles) + qtCompileTest(gstreamer_appsrc) + qtCompileTest(linux_v4l) + } + qtCompileTest(resourcepolicy) qtCompileTest(gpu_vivante) } |