summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-08-08 09:21:30 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-08-08 09:46:22 (GMT)
commit6a3b5c13ac40c18951efd8be1e3506606da0f6f9 (patch)
tree0ba1e570bffe31db709f90c1f7e0b6d6670ed4ea
parent270c644937fb402332671208435ac600b280e5b8 (diff)
downloadQt-6a3b5c13ac40c18951efd8be1e3506606da0f6f9.zip
Qt-6a3b5c13ac40c18951efd8be1e3506606da0f6f9.tar.gz
Qt-6a3b5c13ac40c18951efd8be1e3506606da0f6f9.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
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p_p.h2
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput_p_p.h2
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