diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 08:56:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 08:56:04 (GMT) |
| commit | d3418466c75169a9a1d114c3d0f775288dbc40e7 (patch) | |
| tree | d47112f1318ad5dfd9c727fe5f4ee1e629831711 /mkspecs/modules/qt_webkit_version.pri | |
| parent | 40b11de259b6bdaf43ca9ccd0abd9106321a5616 (diff) | |
| parent | 37ed99a30839696a95c498f7d99a3505936ac29c (diff) | |
| download | Qt-d3418466c75169a9a1d114c3d0f775288dbc40e7.zip Qt-d3418466c75169a9a1d114c3d0f775288dbc40e7.tar.gz Qt-d3418466c75169a9a1d114c3d0f775288dbc40e7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbf
Diffstat (limited to 'mkspecs/modules/qt_webkit_version.pri')
| -rw-r--r-- | mkspecs/modules/qt_webkit_version.pri | 6 |
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 |