diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-13 22:00:15 (GMT) |
| commit | 8399cce50eb11db885e67a52055505951309cae8 (patch) | |
| tree | 56518186c2835fadec353feef725328f85ba4e25 /src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h | |
| parent | 0e4083ba5bf1bbc581d072b016fb977fb1f846c1 (diff) | |
| parent | 870ecb5b44a56b29d16a4819c2d92298801cf98f (diff) | |
| download | Qt-8399cce50eb11db885e67a52055505951309cae8.zip Qt-8399cce50eb11db885e67a52055505951309cae8.tar.gz Qt-8399cce50eb11db885e67a52055505951309cae8.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h')
| -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 665bf1b..63d9e55 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.0" +#define QTWEBKIT_VERSION_STR "2.0.1" // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt. -#define QTWEBKIT_VERSION 0x020000 +#define QTWEBKIT_VERSION 0x020001 // 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)) |