mirror of https://github.com/vitalif/phantomjs
Qt workaround to prevent WebCoreMovieObserver confusion.
See the previous commit 30134bab5d
.
This is just applying disable-quicktime-video.patch.
http://code.google.com/p/phantomjs/issues/detail?id=321
1.5
parent
4ccfa463b9
commit
714642c66c
|
@ -163,10 +163,10 @@ symbian|maemo5|maemo6 {
|
||||||
DEFINES += ENABLE_VIDEO=0
|
DEFINES += ENABLE_VIDEO=0
|
||||||
|
|
||||||
mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
|
mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
|
||||||
DEFINES -= ENABLE_VIDEO=0
|
# DEFINES -= ENABLE_VIDEO=0
|
||||||
DEFINES += ENABLE_VIDEO=1
|
# DEFINES += ENABLE_VIDEO=1
|
||||||
DEFINES += WTF_USE_QTKIT=1
|
# DEFINES += WTF_USE_QTKIT=1
|
||||||
DEFINES -= WTF_USE_QTKIT=0
|
# DEFINES -= WTF_USE_QTKIT=0
|
||||||
} else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
|
} 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): {
|
!contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
|
||||||
DEFINES -= ENABLE_VIDEO=0
|
DEFINES -= ENABLE_VIDEO=0
|
||||||
|
|
Loading…
Reference in New Issue