diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 14:52:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 14:52:08 (GMT) |
| commit | c0f415bdea15c7382800829bd5f5683aa7cd99ec (patch) | |
| tree | 852c0af9773d4fb40651fe0b140941dd1c5d4fce /src/3rdparty | |
| parent | ad365cf942e339271706554ac86319d99538bad9 (diff) | |
| parent | 184398f4ada4b34fc9834c2341597a3b8c18e842 (diff) | |
| download | Qt-c0f415bdea15c7382800829bd5f5683aa7cd99ec.zip Qt-c0f415bdea15c7382800829bd5f5683aa7cd99ec.tar.gz Qt-c0f415bdea15c7382800829bd5f5683aa7cd99ec.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (60 commits)
Fix QTBUG-17627: build break in mobility bearer applications
Add the missing image for doc of QNetworkSession.
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Fix QPlainTextEdit corruption/crash with scrolling
DelayRemove of list delegate on section boundary duplicated section
add gsm to connectable bearer for networkmanager.
ListView and GridView indexAt should use qreal coordinates.
Prevent infinite loop in raster engine on zero dash pattern length.
Cocoa: Sheets looses focus when moving parent window
Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset
Fix QNetworkConfigurationManager crash due to null private pointer.
Fix animations with alwaysRunToEnd that are frequently stopped/started.
Fix auto test failure on mac.
Update QtGui def files
Another stab at fixing compilation on old Symbian platforms
Prevent an animation from being registered to run twice.
Add missing test file.
Add selected P1 tasks to changes file.
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
...
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)) |