diff options
| author | Ademar de Souza Reis Jr <ademar.reis@openbossa.org> | 2011-02-16 20:05:55 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-17 09:16:20 (GMT) |
| commit | 7a0adef5792970aa77e2479c4e5f63ead686d17f (patch) | |
| tree | 25123f23fe9e34294a34f7d74fb09159e374cdc6 /src | |
| parent | a1d755e325c40995ae6f12071582d929fddc7633 (diff) | |
| download | Qt-7a0adef5792970aa77e2479c4e5f63ead686d17f.zip Qt-7a0adef5792970aa77e2479c4e5f63ead686d17f.tar.gz Qt-7a0adef5792970aa77e2479c4e5f63ead686d17f.tar.bz2 | |
Bump QtWebKit version to 2.0.2
QtWebKit 2.0.1 was part of Qt-4.7.1, QtWebKit as included
in 4.7.2 should be 2.0.2.
Merge-request: 1095
Task-number: QTBUG-17480
Reviewed-by: Jason McDonald
(cherry picked from commit dfde84cccb14b109bebd672108a0ce0d6131361f)
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h index 63d9e55..2c0bf6d 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h @@ -22,9 +22,9 @@ #include <QtCore/qglobal.h> -#define QTWEBKIT_VERSION_STR "2.0.1" +#define QTWEBKIT_VERSION_STR "2.0.2" // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt. -#define QTWEBKIT_VERSION 0x020001 +#define QTWEBKIT_VERSION 0x020002 // 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)) |