diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-20 19:56:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-20 19:56:49 (GMT) |
| commit | 81c8759c23969dad0d300d844341379bfcd6611a (patch) | |
| tree | 6cc7bb3f15e28d1444b13035930cb38079b2927f /src/3rdparty | |
| parent | 5981173f0451736bf2b53e7bf36dbbd02d8f3904 (diff) | |
| parent | 13e9642616ab480d09bda2603cc89dcaea7a1ad6 (diff) | |
| download | Qt-81c8759c23969dad0d300d844341379bfcd6611a.zip Qt-81c8759c23969dad0d300d844341379bfcd6611a.tar.gz Qt-81c8759c23969dad0d300d844341379bfcd6611a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits)
Autotest: make at least one update before checking if more are needed
Fix warning about id maybe used when uninitialised
Doc: setSslConfiguration also sets the CA certificates
Autotest: check that the type received is the expected one
Attempt to fix symbian 3.1 and 3.2 compile break.
Prevents crashing when ICO file has bad color table value
directfb: fix crash in client/server mode of qws
Make Qt/DirectFB less verbose about failing to load pixmaps.
Autotest: don't use the deprecated signal from QDBusConnectionInterface
Autotest: be nicer to the subprocess and SIGTERM it
Fix warnings in QtDeclarative
Autotest: avoid memory leaks if test fails
QtDBus: Make sure we can receive unknown types
QtDBus meta object: keep methods, signals and props with unknown types
Autotest: add a new test for parsing an introspection with unknown types
Make the QtDBus parser not complain about unknown things
fix-layer-getsurface-result-check-for-screen-size-determination
Bump QtWebKit version to 2.0.2
SSL: fix memory leak when loading certificates on Mac OS X
Add a mutex to protect the access to the QSet.
...
Diffstat (limited to 'src/3rdparty')
| -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)) |