diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 14:25:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 14:25:36 (GMT) |
| commit | 2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c (patch) | |
| tree | 1658c65acdb674d1865511cb4c8fafb39049b17d /src/gui/kernel | |
| parent | d5716c0b27bcddfea0f1787aa59a08e340d64e30 (diff) | |
| parent | 81351f2c6f9a939e4c34cb3be6280d396c21941f (diff) | |
| download | Qt-2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c.zip Qt-2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c.tar.gz Qt-2479c1b17ca2399c9df94dd7e1b66d3a3a896a5c.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:
Fix one character displacement for cursor in line edits
Fix header not found build error
QTBUG-16110 updating the softkeys when app comes to foreground
Workaround crash when multiple QNetworkAccessManager instances are used
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 789f198..ba06312 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2016,6 +2016,9 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent S60->wsSession().SetPointerCursorMode(EPointerCursorNormal); } #endif +#ifdef QT_SOFTKEYS_ENABLED + QSoftKeyManager::updateSoftKeys(); +#endif break; case EEventFocusLost: if (callSymbianEventFilters(symbianEvent)) |