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>

diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 84f2548..489589d 100644 (file)
--- 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)
 }