From 755f2178b1ae6c844f42c371b94c69ce1ffc8b16 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 30 Dec 2009 13:19:42 +0100 Subject: Symbian build fix Disable bearer management support in WebKit for builds inside Qt. We can't depend on an external module that depends on what we're building right now :) This is just a stop-gap fix. Reviewed-by: Trust me (cherry picked from commit 5ac2736a7733197bde86ea4fb873ba9b1038d444) --- src/3rdparty/webkit/WebCore/WebCore.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 007f6f6..b189f13 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -180,7 +180,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { else:DEFINES += ENABLE_XSLT=0 } -!contains(DEFINES, ENABLE_QT_BEARER=.) { +!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_BEARER=.) { symbian: { exists($${EPOCROOT}epoc32/release/winscw/udeb/QtBearer.lib)| \ exists($${EPOCROOT}epoc32/release/armv5/lib/QtBearer.lib) { -- cgit v0.12