summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-12-30 12:19:42 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-12-30 12:20:39 (GMT)
commit5ac2736a7733197bde86ea4fb873ba9b1038d444 (patch)
tree6c37f63d81cbc78081a047c98d7730b5c538a5e9 /src
parenta8454801a1fc195d2ef6e1a05042ccf0833d8edd (diff)
downloadQt-5ac2736a7733197bde86ea4fb873ba9b1038d444.zip
Qt-5ac2736a7733197bde86ea4fb873ba9b1038d444.tar.gz
Qt-5ac2736a7733197bde86ea4fb873ba9b1038d444.tar.bz2
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
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/WebCore/WebCore.pro2
1 files changed, 1 insertions, 1 deletions
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) {