diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 13:56:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 13:56:51 (GMT) |
| commit | a66efc054ce9a9b2fc0535a7269f921ea411498c (patch) | |
| tree | 22a6800bc89786e96a0a69af82c246f12dfea0d4 /mkspecs | |
| parent | a8829a52d65a9759d5dffe98fb07b384c54db1c8 (diff) | |
| parent | cd304989839f31b59a2605a639864da21ec6f174 (diff) | |
| download | Qt-a66efc054ce9a9b2fc0535a7269f921ea411498c.zip Qt-a66efc054ce9a9b2fc0535a7269f921ea411498c.tar.gz Qt-a66efc054ce9a9b2fc0535a7269f921ea411498c.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 9a83f22bc41a2016b6bbf495bfd32b3a659038c8
Fix versioning of pkg files on Symbian for apps linking against WebKit
Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/modules/qt_webkit_version.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri new file mode 100644 index 0000000..0370720 --- /dev/null +++ b/mkspecs/modules/qt_webkit_version.pri @@ -0,0 +1,2 @@ +# The version information comes from our copy of +include($$PWD/../../src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri) |