diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-30 12:19:42 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-13 13:18:13 (GMT) |
| commit | 755f2178b1ae6c844f42c371b94c69ce1ffc8b16 (patch) | |
| tree | e2655328267ccaa1e0483e9e4ae2b15fe11013bd | |
| parent | f404346ac40631fd46fbaeec3c808d86a7ec2fd5 (diff) | |
| download | Qt-755f2178b1ae6c844f42c371b94c69ce1ffc8b16.zip Qt-755f2178b1ae6c844f42c371b94c69ce1ffc8b16.tar.gz Qt-755f2178b1ae6c844f42c371b94c69ce1ffc8b16.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
(cherry picked from commit 5ac2736a7733197bde86ea4fb873ba9b1038d444)
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
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) { |