Workaround to prevent WebCoreMovieObserver confusion.

The solution is for the static build script to disable QuickTime video.
In many cases, video support for a headless engine is not so useful.

http://code.google.com/p/phantomjs/issues/detail?id=321
1.5
Ariya Hidayat 2011-12-29 19:25:18 -08:00
parent 91b272760b
commit 30134bab5d
2 changed files with 20 additions and 0 deletions

View File

@ -36,6 +36,7 @@ mv qt-everywhere-opensource-src-$QT_VERSION Qt-$QT_VERSION
cd $QT_FOLDER
patch configure ../allow-static-qtwebkit.patch
patch -p1 < ../qapplication_skip_qtmenu.patch
patch -p1 < ../disable_quicktime_video.patch
rm -rf src/3rdparty/webkit/Source/WebKit/qt/tests

View File

@ -0,0 +1,19 @@
diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri
index f04d0b4..5e4bfbe 100644
--- a/src/3rdparty/webkit/Source/WebCore/features.pri
+++ b/src/3rdparty/webkit/Source/WebCore/features.pri
@@ -163,10 +163,10 @@ symbian|maemo5|maemo6 {
DEFINES += ENABLE_VIDEO=0
mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
- DEFINES -= ENABLE_VIDEO=0
- DEFINES += ENABLE_VIDEO=1
- DEFINES += WTF_USE_QTKIT=1
- DEFINES -= WTF_USE_QTKIT=0
+ # DEFINES -= ENABLE_VIDEO=0
+ # DEFINES += ENABLE_VIDEO=1
+ # DEFINES += WTF_USE_QTKIT=1
+ # DEFINES -= WTF_USE_QTKIT=0
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
!contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
DEFINES -= ENABLE_VIDEO=0