- Revision
- 91752
- Author
- [email protected]
- Date
- 2011-07-26 06:34:26 -0700 (Tue, 26 Jul 2011)
Log Message
Patch by Alexis Menard <[email protected]> on 2011-07-26
Reviewed by Andreas Kling.
[Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
https://bugs.webkit.org/show_bug.cgi?id=63472
Source/_javascript_Core:
Enable the bits needed for GStreamer only when QtMultimedia is not used.
* wtf/wtf.pri:
Source/WebCore:
Enable the GStreamer backend and the QuickTime backend as default media players
for the Qt port on Mac and Linux. QtMultimedia is now a fallback option that you
can enable by passing DEFINES+=USE_QT_MULTIMEDIA=1 to enforce its usage.
No new tests. The media layout tests are disabled on the Qt port but hopefully with this
switch we can enable them again.
* WebCore.pri:
* WebCore.pro:
* features.pri:
Source/WebKit/qt:
Use the flag WTF_USE_QTKIT=1 rather than USE_QTKIT=1 because that flag doesn't
exist anymore, it's the default. Ditto for GStreamer.
* QtWebKit.pro:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (91751 => 91752)
--- trunk/Source/_javascript_Core/ChangeLog 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-07-26 13:34:26 UTC (rev 91752)
@@ -1,3 +1,14 @@
+2011-07-26 Alexis Menard <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=63472
+
+ Enable the bits needed for GStreamer only when QtMultimedia is not used.
+
+ * wtf/wtf.pri:
+
2011-07-26 Shinya Kawanaka <[email protected]>
Added an interface to take IsWhiteSpaceFunctionPtr.
Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (91751 => 91752)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-07-26 13:34:26 UTC (rev 91752)
@@ -41,7 +41,7 @@
wtf/unicode/icu/CollatorICU.cpp \
wtf/unicode/UTF8.cpp
-contains(DEFINES, USE_GSTREAMER=1) {
+linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
DEFINES += ENABLE_GLIB_SUPPORT=1
PKGCONFIG += glib-2.0 gio-2.0
CONFIG += link_pkgconfig
Modified: trunk/Source/WebCore/ChangeLog (91751 => 91752)
--- trunk/Source/WebCore/ChangeLog 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebCore/ChangeLog 2011-07-26 13:34:26 UTC (rev 91752)
@@ -1,3 +1,21 @@
+2011-07-26 Alexis Menard <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=63472
+
+ Enable the GStreamer backend and the QuickTime backend as default media players
+ for the Qt port on Mac and Linux. QtMultimedia is now a fallback option that you
+ can enable by passing DEFINES+=USE_QT_MULTIMEDIA=1 to enforce its usage.
+
+ No new tests. The media layout tests are disabled on the Qt port but hopefully with this
+ switch we can enable them again.
+
+ * WebCore.pri:
+ * WebCore.pro:
+ * features.pri:
+
2011-07-26 Pavel Feldman <[email protected]>
Web Inspector: Implement setPropertyValue using evaluate and callFunctionOn
Modified: trunk/Source/WebCore/WebCore.pri (91751 => 91752)
--- trunk/Source/WebCore/WebCore.pri 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebCore/WebCore.pri 2011-07-26 13:34:26 UTC (rev 91752)
@@ -254,26 +254,22 @@
}
contains(DEFINES, ENABLE_VIDEO=1) {
- contains(DEFINES, USE_QTKIT=1) {
- DEFINES += WTF_USE_QTKIT=1
-
+ contains(DEFINES, WTF_USE_QTKIT=1) {
INCLUDEPATH += $$PWD/platform/graphics/mac
LIBS += -framework AppKit -framework AudioUnit \
-framework AudioToolbox -framework CoreAudio \
-framework QuartzCore -framework QTKit
- } else:contains(DEFINES, USE_GSTREAMER=1) {
- DEFINES += WTF_USE_GSTREAMER=1
+ } else:contains(DEFINES, WTF_USE_GSTREAMER=1) {
DEFINES += ENABLE_GLIB_SUPPORT=1
INCLUDEPATH += $$PWD/platform/graphics/gstreamer
PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
- } else:contains(MOBILITY_CONFIG, multimedia) {
+ } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
CONFIG *= mobility
MOBILITY *= multimedia
- DEFINES += WTF_USE_QT_MULTIMEDIA=1
}
}
Modified: trunk/Source/WebCore/WebCore.pro (91751 => 91752)
--- trunk/Source/WebCore/WebCore.pro 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebCore/WebCore.pro 2011-07-26 13:34:26 UTC (rev 91752)
@@ -3047,7 +3047,7 @@
DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
- } else: contains(DEFINES, USE_GSTREAMER=1) {
+ } else: contains(DEFINES, WTF_USE_GSTREAMER=1) {
HEADERS += \
platform/graphics/gstreamer/GOwnPtrGStreamer.h \
platform/graphics/gstreamer/GRefPtrGStreamer.h \
@@ -3068,7 +3068,7 @@
platform/graphics/gstreamer/PlatformVideoWindowQt.cpp \
platform/graphics/gstreamer/ImageGStreamerQt.cpp
- } else:contains(MOBILITY_CONFIG, multimedia) {
+ } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
HEADERS += \
platform/graphics/qt/MediaPlayerPrivateQt.h
Modified: trunk/Source/WebCore/features.pri (91751 => 91752)
--- trunk/Source/WebCore/features.pri 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebCore/features.pri 2011-07-26 13:34:26 UTC (rev 91752)
@@ -184,17 +184,17 @@
DEFINES -= ENABLE_VIDEO=1
DEFINES += ENABLE_VIDEO=0
- contains(DEFINES, USE_QTKIT=1) {
+ mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
- DEFINES -= WTF_USE_QT_MULTIMEDIA=1
- DEFINES += WTF_USE_QT_MULTIMEDIA=0
- } else: contains(DEFINES, USE_GSTREAMER=1) {
+ DEFINES += WTF_USE_QTKIT=1
+ DEFINES -= WTF_USE_QTKIT=0
+ } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
- DEFINES -= WTF_USE_QT_MULTIMEDIA=1
- DEFINES += WTF_USE_QT_MULTIMEDIA=0
- } else:contains(MOBILITY_CONFIG, multimedia) {
+ DEFINES += WTF_USE_GSTREAMER=1
+ DEFINES -= WTF_USE_GSTREAMER=0
+ } else: contains(MOBILITY_CONFIG, multimedia) {
DEFINES -= ENABLE_VIDEO=0
DEFINES += ENABLE_VIDEO=1
DEFINES -= WTF_USE_QT_MULTIMEDIA=0
Modified: trunk/Source/WebKit/qt/ChangeLog (91751 => 91752)
--- trunk/Source/WebKit/qt/ChangeLog 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-07-26 13:34:26 UTC (rev 91752)
@@ -1,3 +1,15 @@
+2011-07-26 Alexis Menard <[email protected]>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=63472
+
+ Use the flag WTF_USE_QTKIT=1 rather than USE_QTKIT=1 because that flag doesn't
+ exist anymore, it's the default. Ditto for GStreamer.
+
+ * QtWebKit.pro:
+
2011-07-25 Caio Marcelo de Oliveira Filho <[email protected]>
[Qt] Add more tests to cover the behavior of loadFinished() signal
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (91751 => 91752)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-07-26 12:16:28 UTC (rev 91751)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-07-26 13:34:26 UTC (rev 91752)
@@ -225,17 +225,17 @@
}
contains(DEFINES, ENABLE_VIDEO=1) {
- !contains(DEFINES, USE_QTKIT=1):!contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) {
+ !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h
SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp
}
- contains(DEFINES, USE_QTKIT=1) | contains(DEFINES, USE_GSTREAMER=1) | contains(MOBILITY_CONFIG, multimedia) {
+ contains(DEFINES, WTF_USE_QTKIT=1) | contains(DEFINES, WTF_USE_GSTREAMER=1) | contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h
SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp
}
- contains(DEFINES, USE_QTKIT=1) {
+ contains(DEFINES, WTF_USE_QTKIT=1) {
INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/ \
$$SOURCE_DIR/WebCore/platform/mac/ \
$$SOURCE_DIR/../WebKitLibraries/
