diff options
| author | Zeno Albisser <zeno@webkit.org> | 2012-01-06 16:32:26 (GMT) |
|---|---|---|
| committer | Zeno Albisser <zeno@webkit.org> | 2012-01-06 16:33:06 (GMT) |
| commit | dcb4ac40a07a9321829414e5f996d0dec8627954 (patch) | |
| tree | 73be72ffe3b0dfafc9635b21e7a87a7464f27246 /src/3rdparty | |
| parent | 4e73732d3e72ea59d39ec5a5c01c2e76bbff7dc1 (diff) | |
| download | Qt-dcb4ac40a07a9321829414e5f996d0dec8627954.zip Qt-dcb4ac40a07a9321829414e5f996d0dec8627954.tar.gz Qt-dcb4ac40a07a9321829414e5f996d0dec8627954.tar.bz2 | |
Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/.tag | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 3868886..9c283fb 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -83439de78841f9569ad78e3a84b7b888337b5d18 +7b7ded42f42a558bc5672c2523f9c5689bb975d0 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h index 7ee56de..b82d0c6 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitglobal.h @@ -22,9 +22,9 @@ #include <QtCore/qglobal.h> -#define QTWEBKIT_VERSION_STR "2.2.0" +#define QTWEBKIT_VERSION_STR "2.2.2" // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt. -#define QTWEBKIT_VERSION 0x020200 +#define QTWEBKIT_VERSION 0x020202 // Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt. #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index a08cc05..28a89dc 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 83439de78841f9569ad78e3a84b7b888337b5d18 + 7b7ded42f42a558bc5672c2523f9c5689bb975d0 |