Title: [148422] trunk/Tools
- Revision
- 148422
- Author
- allan.jen...@digia.com
- Date
- 2013-04-15 02:16:31 -0700 (Mon, 15 Apr 2013)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (148421 => 148422)
--- trunk/Tools/ChangeLog 2013-04-15 09:11:40 UTC (rev 148421)
+++ trunk/Tools/ChangeLog 2013-04-15 09:16:31 UTC (rev 148422)
@@ -1,3 +1,14 @@
+2013-04-15 Allan Sandfeld Jensen <allan.jen...@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 <rn...@webkit.org>
Build fix attempt for webkitbot. Unicodify everything.
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (148421 => 148422)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-04-15 09:11:40 UTC (rev 148421)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-04-15 09:16:31 UTC (rev 148422)
@@ -121,18 +121,22 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
