diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-04 15:11:09 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-04 15:11:09 (GMT) |
| commit | fec2bc79158a4d0c5aebf99429cfdd945d4e8341 (patch) | |
| tree | 66c42c98947d6b109cee8f42a9478f1db4ccfa08 /src/3rdparty/webkit/WebCore/WebCore.pro | |
| parent | 51c3d06e09b5e501ed7536504053c02366b2df0d (diff) | |
| download | Qt-fec2bc79158a4d0c5aebf99429cfdd945d4e8341.zip Qt-fec2bc79158a4d0c5aebf99429cfdd945d4e8341.tar.gz Qt-fec2bc79158a4d0c5aebf99429cfdd945d4e8341.tar.bz2 | |
Updated WebKit to 903617844b4341f7098b63b54e5be16cd83af647
|| <https://webkit.org/b/40116> || [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pro')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index ba669bd..048fc93 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2496,8 +2496,12 @@ contains(DEFINES, ENABLE_QT_BEARER=1) { SOURCES += \ platform/network/qt/NetworkStateNotifierQt.cpp - CONFIG += mobility - MOBILITY += bearer + # Bearer management is part of Qt 4.7, so don't accidentially + # pull in Qt Mobility when building against >= 4.7 + !greaterThan(QT_MINOR_VERSION, 6) { + CONFIG += mobility + MOBILITY += bearer + } } contains(DEFINES, ENABLE_SVG=1) { |