diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 21:15:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 21:15:26 (GMT) |
| commit | c37979778143e792227440e6531b5233d078a7b1 (patch) | |
| tree | 22823d778c1b4298f120fde0c2e555207a2406cb /mkspecs | |
| parent | 6982c5e7f9d93d26ab5f241af0a5c6e80cd0e1ff (diff) | |
| parent | 5d7b4968cc181726b97848bda5684da99e6db312 (diff) | |
| download | Qt-c37979778143e792227440e6531b5233d078a7b1.zip Qt-c37979778143e792227440e6531b5233d078a7b1.tar.gz Qt-c37979778143e792227440e6531b5233d078a7b1.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) |