summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-06-15 08:25:24 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-06-15 08:25:24 (GMT)
commit37ed99a30839696a95c498f7d99a3505936ac29c (patch)
tree768aa008588c012235798e22d45121aa8264fc1d /mkspecs
parent7390cfbcbd5000a7da3eb5dbef790d114b06d042 (diff)
downloadQt-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 'mkspecs')
-rw-r--r--mkspecs/modules/qt_webkit_version.pri6
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri
index 0370720..ffd192c 100644
--- a/mkspecs/modules/qt_webkit_version.pri
+++ b/mkspecs/modules/qt_webkit_version.pri
@@ -1,2 +1,4 @@
-# The version information comes from our copy of
-include($$PWD/../../src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri)
+QT_WEBKIT_VERSION = 4.7.0
+QT_WEBKIT_MAJOR_VERSION = 4
+QT_WEBKIT_MINOR_VERSION = 7
+QT_WEBKIT_PATCH_VERSION = 0