summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-09-14 12:36:58 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-09-14 12:36:58 (GMT)
commit7769e7bf79f0c17a01874fa0b3f1b227c1e41e93 (patch)
treee69de39b2e33323b8213d0d7e7469bd33d9fb60e /src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
parent6cd8a6001fe87107d32524c6115d37b620d3e108 (diff)
parent8399cce50eb11db885e67a52055505951309cae8 (diff)
downloadQt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.zip
Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.gz
Qt-7769e7bf79f0c17a01874fa0b3f1b227c1e41e93.tar.bz2
Merge branch '4.7' of ../qt-doc-team into 4.7
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h4
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))