From b5c058f62a79efa213e4492ac7209b3a92f45e3b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sat, 5 Jul 2014 09:10:02 +0200
Subject: [PATCH 2/2] qtmultimedia.pro: Respect
 OE_GSTREAMER_ENABLED,OE_GSTREAMER010_ENABLED and OE_OPENAL_ENABLED

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 qtmultimedia.pro | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/qtmultimedia.pro b/qtmultimedia.pro
index 109dd81..54b67a8 100644
--- a/qtmultimedia.pro
+++ b/qtmultimedia.pro
@@ -1,7 +1,7 @@
 requires(qtHaveModule(gui))
 
 load(configure)
-qtCompileTest(openal)
+OE_OPENAL_ENABLED:qtCompileTest(openal)
 win32 {
     qtCompileTest(directshow) {
         qtCompileTest(wshellitem)
@@ -18,14 +18,17 @@ win32 {
     qtCompileTest(alsa)
     qtCompileTest(pulseaudio)
     !done_config_gstreamer {
-        gstver=1.0
-        cache(GST_VERSION, set, gstver);
-        qtCompileTest(gstreamer) {
-            qtCompileTest(gstreamer_photography)
-            qtCompileTest(gstreamer_encodingprofiles)
-            qtCompileTest(gstreamer_appsrc)
-            qtCompileTest(linux_v4l)
-        } else {
+        OE_GSTREAMER_ENABLED {
+            gstver=1.0
+            cache(GST_VERSION, set, gstver);
+            qtCompileTest(gstreamer) {
+                qtCompileTest(gstreamer_photography)
+                qtCompileTest(gstreamer_encodingprofiles)
+                qtCompileTest(gstreamer_appsrc)
+                qtCompileTest(linux_v4l)
+            }
+        }
+        !OE_GSTREAMER_ENABLED:OE_GSTREAMER010_ENABLED {
             gstver=0.10
             cache(GST_VERSION, set, gstver);
             # Force a re-run of the test
-- 
2.1.3