From ab82e84901ba8384f75a12da82fed6a47d483038 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 8 Apr 2010 16:47:11 +0200 Subject: Fix the build of webkit examples on platforms without OpenGL and Multimedia The QtWebKit module header unconditionally includes QtOpenGL, due to a syncqt bug. Apply the same workaround as in http://trac.webkit.org/changeset/53627 for OpenGL and Multimedia as link time dependencies for QtWebKit. Reviewed-by: Jocelyn Turcotte --- src/3rdparty/webkit/WebCore/WebCore.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 00a85f6..bdb3f83 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2370,7 +2370,7 @@ contains(DEFINES, ENABLE_VIDEO=1) { HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp - QT += multimedia + tobe|!tobe: QT += multimedia } else { HEADERS += \ platform/graphics/qt/MediaPlayerPrivatePhonon.h @@ -2745,7 +2745,7 @@ contains(DEFINES, ENABLE_WEB_SOCKETS=1) { } contains(DEFINES, ENABLE_3D_CANVAS=1) { -QT += opengl +tobe|!tobe: QT += opengl HEADERS += \ bindings/js/JSWebGLArrayBufferConstructor.h \ bindings/js/JSWebGLArrayHelper.h \ -- cgit v0.12