diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 08:25:24 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-15 08:25:24 (GMT) |
commit | 37ed99a30839696a95c498f7d99a3505936ac29c (patch) | |
tree | 768aa008588c012235798e22d45121aa8264fc1d /src/3rdparty/webkit/WebCore/WebCore.pri | |
parent | 7390cfbcbd5000a7da3eb5dbef790d114b06d042 (diff) | |
download | Qt-37ed99a30839696a95c498f7d99a3505936ac29c.zip Qt-37ed99a30839696a95c498f7d99a3505936ac29c.tar.gz Qt-37ed99a30839696a95c498f7d99a3505936ac29c.tar.bz2 |
Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbf
Integrated fix:
|| <https://webkit.org/b/40487> || [Qt] The qt_webkit_version.pri file gets overwritten on install ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore/WebCore.pri')
-rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pri b/src/3rdparty/webkit/WebCore/WebCore.pri index 9debd6a..97ae526 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/WebCore/WebCore.pri @@ -107,7 +107,7 @@ greaterThan(QT_MINOR_VERSION, 5) { !lessThan(QT_MINOR_VERSION, 7) { DEFINES += ENABLE_QT_BEARER=1 } else { - load(mobilityconfig) + load(mobilityconfig, true) contains(MOBILITY_CONFIG, bearer) { DEFINES += ENABLE_QT_BEARER=1 } |