diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-08-08 09:21:30 (GMT) |
|---|---|---|
| committer | Timo Turunen <timo.p.turunen@nokia.com> | 2011-08-30 07:02:06 (GMT) |
| commit | 84f29a47efa4a3cd44d24ff46d8d410fbd10a0d8 (patch) | |
| tree | 7e61eb7680def4c5be84c1ba605c225df48a0893 /src/declarative | |
| parent | ad2164422b0e3b2c5f3b247a1e813271428d8f0d (diff) | |
| download | Qt-84f29a47efa4a3cd44d24ff46d8d410fbd10a0d8.zip Qt-84f29a47efa4a3cd44d24ff46d8d410fbd10a0d8.tar.gz Qt-84f29a47efa4a3cd44d24ff46d8d410fbd10a0d8.tar.bz2 | |
Fix undesirable VKB popup at task switch
showInputPanelOnFocus = false needs to be set in declarative edit
controls also on S60 platforms beyond Symbian^3, or VKB will popup
when application itself comes to foreground if focus is on an edit
control.
With this fix the functionality is identical to S60 native apps.
Task-number: QTBUG-20218
Reviewed-by: Joona Petrell
(cherry picked from commit 6a3b5c13ac40c18951efd8be1e3506606da0f6f9)
Reapplied after bad v4.7.4 merge
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 2 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput_p_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index 731d956..412d33c 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -77,7 +77,7 @@ public: yoff(0) { #ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) { + if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { showInputPanelOnFocus = false; } #endif diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index d3f11f6..0ae984a 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -80,7 +80,7 @@ public: selectPressed(false) { #ifdef Q_OS_SYMBIAN - if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) { + if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_1) { showInputPanelOnFocus = false; } #endif |