diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 18:44:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-21 18:44:21 (GMT) |
| commit | 7f3d9a76e9d956d9e7e4398ac20785070e214958 (patch) | |
| tree | 63e1dc9f928842deae7dcadeb3981334b5867d12 /src/gui | |
| parent | b4334982c1cb6058f02a6633cdf3cacc334d8e51 (diff) | |
| parent | 09b770aee2a39e7445d5154e7b8ba3ccc249d55f (diff) | |
| download | Qt-7f3d9a76e9d956d9e7e4398ac20785070e214958.zip Qt-7f3d9a76e9d956d9e7e4398ac20785070e214958.tar.gz Qt-7f3d9a76e9d956d9e7e4398ac20785070e214958.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Update 4.7-beta2 def files
Added Samsung and Sony-Ericsson manufacturer IDs to sqlite3.sis
Fix for TLS problem which causes apps to crash in the S60 port
Fixed bearer plugin deployment in libinfixed builds
Always add QtNetwork include path when linking with QtWebkit in Symbian
Assigning 0xA UID3s to the new standalone qml demos
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qt_s60_p.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h index ed53ccf..204e38c 100644 --- a/src/gui/kernel/qt_s60_p.h +++ b/src/gui/kernel/qt_s60_p.h @@ -253,8 +253,35 @@ private: }; inline QS60Data::QS60Data() +: uid(TUid::Null()), + screenDepth(0), + screenWidthInPixels(0), + screenHeightInPixels(0), + screenWidthInTwips(0), + screenHeightInTwips(0), + defaultDpiX(0), + defaultDpiY(0), + curWin(0), + virtualMousePressedKeys(0), + virtualMouseAccelDX(0), + virtualMouseAccelDY(0), + virtualMouseMaxAccel(0), +#ifndef Q_SYMBIAN_FIXED_POINTER_CURSORS + brokenPointerCursors(0), +#endif + hasTouchscreen(0), + mouseInteractionEnabled(0), + virtualMouseRequired(0), + qtOwnsS60Environment(0), + supportsPremultipliedAlpha(0), + avkonComponentsSupportTransparency(0), + menuBeingConstructed(0), + memoryLimitForHwRendering(0), + s60ApplicationFactory(0), +#ifdef Q_WS_S60 + s60InstalledTrapHandler(0) +#endif { - memclr(this, sizeof(QS60Data)); //zero init data } inline void QS60Data::updateScreenSize() |