[Qt] QtMultimedia not used when GStreamer is not found
authorallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Apr 2013 09:16:31 +0000 (09:16 +0000)
committerallan.jensen@digia.com <allan.jensen@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 15 Apr 2013 09:16:31 +0000 (09:16 +0000)
https://bugs.webkit.org/show_bug.cgi?id=111842

Reviewed by Philippe Normand.

Fallback to using QtMultimedia when native libraries are not found.

* qmake/mkspecs/features/features.prf:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/qmake/mkspecs/features/features.prf

index 174ad50..9a72427 100644 (file)
@@ -1,3 +1,14 @@
+2013-04-15  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        [Qt] QtMultimedia not used when GStreamer is not found
+        https://bugs.webkit.org/show_bug.cgi?id=111842
+
+        Reviewed by Philippe Normand.
+
+        Fallback to using QtMultimedia when native libraries are not found.
+
+        * qmake/mkspecs/features/features.prf:
+
 2013-04-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         Build fix attempt for webkitbot. Unicodify everything.
index b461691..9e75e36 100644 (file)
@@ -121,18 +121,22 @@ defineTest(detectFeatures) {
                 WEBKIT_CONFIG += video use_qtkit
             }
         }
-    } else: linux-* {
-        !contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+    } else: !contains(QT_CONFIG, no-pkg-config) {
+        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
             WEBKIT_CONFIG += video use_gstreamer
-        } else:!contains(QT_CONFIG, no-pkg-config):packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
             WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
-        } else {
-            CONFIGURE_WARNINGS += "Missing GLib/Gio/GStreamer, disabling media element support"
         }
-    } else: haveQtModule(multimediawidgets) {
+    }
+
+    !enable?(video):haveQtModule(multimediawidgets) {
         WEBKIT_CONFIG += video use_qt_multimedia
     }
 
+    !enable?(video) {
+        CONFIGURE_WARNINGS += "Missing GStreamer, QTKit or QtMultimedia, disabling media element support"
+    }
+
     # Try to use an system wide SQlite installation
     if(!contains(QT_CONFIG, no-pkg-config):packagesExist("sqlite3"))|mac {
         WEBKIT_CONFIG += have_sqlite3