diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-18 09:01:28 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-08-18 09:01:28 (GMT) |
commit | d9b8c530fceced62ab620307f399c3e985640282 (patch) | |
tree | b53c8043d7c244437ec8655f4186e26f34ce7a5b /src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | |
parent | 182b10dbad23e9da310c0d600095f17c41dd0d3c (diff) | |
parent | 5e435bfcad5a05c775c9d45edbd2659c87416754 (diff) | |
download | Qt-d9b8c530fceced62ab620307f399c3e985640282.zip Qt-d9b8c530fceced62ab620307f399c3e985640282.tar.gz Qt-d9b8c530fceced62ab620307f399c3e985640282.tar.bz2 |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p_p.h')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit_p_p.h | 2 |
1 files changed, 1 insertions, 1 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 |