diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-08 10:13:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-08 10:13:40 (GMT) |
| commit | 9c45f9ac644adf44fecb48e2c4ea44fca809bc7d (patch) | |
| tree | 6bc60f56535997a0a25f9a992f7dccc4fd421262 | |
| parent | 059a2ff8d621d9c67e3a97969d34edb6e173a4f3 (diff) | |
| parent | 6a3b5c13ac40c18951efd8be1e3506606da0f6f9 (diff) | |
| download | Qt-9c45f9ac644adf44fecb48e2c4ea44fca809bc7d.zip Qt-9c45f9ac644adf44fecb48e2c4ea44fca809bc7d.tar.gz Qt-9c45f9ac644adf44fecb48e2c4ea44fca809bc7d.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 undesirable VKB popup at task switch
| -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 |