Changeset 91752 in webkit for trunk/Source/JavaScriptCore/wtf/wtf.pri

Timestamp:

Jul 26, 2011, 6:34:26 AM (14 years ago)

Author:

[email protected]

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/JavaScriptCore:

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:

File:

• trunk/Source/JavaScriptCore/wtf/wtf.pri (modified) (1 diff)

trunk/Source/JavaScriptCore/wtf/wtf.pri

@@ -42 +42 @@
     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