diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 19:57:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-04 19:57:44 (GMT) |
| commit | fa8612b3ff33ecd4477776829990da137bd52065 (patch) | |
| tree | cceb86770fc0da25ab4b9be5e4c433bbb0fb813f /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | e3ee3780777b07e6283a8b33cd4f7e1d56241d1c (diff) | |
| parent | 65c063a531810f5a21c00a0afb81cdd68d0d6961 (diff) | |
| download | Qt-fa8612b3ff33ecd4477776829990da137bd52065.zip Qt-fa8612b3ff33ecd4477776829990da137bd52065.tar.gz Qt-fa8612b3ff33ecd4477776829990da137bd52065.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Move QListModelInterface into util.
Ensure ParticleMotionGravity always pulls in the right direction.
Remove version ifdefs from Particles; only 4.7 is supported.
Update docs for the runtime.orientation values
Revert to Portrait/Landscape terminology for Orientation enum, with
Add more Q_AUTOTEST_EXPORTs
Improve input panel handling in declarative demos and examples
Always integer align anchor center points
Add header and footer to GridView
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 94973f2..d0e0ad3 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1489,7 +1489,7 @@ void QDeclarativeTextEdit::focusInEvent(QFocusEvent *event) { Q_D(const QDeclarativeTextEdit); if (d->showInputPanelOnFocus) { - if (d->focusOnPress && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) { + if (d->focusOnPress && !isReadOnly()) { openSoftwareInputPanel(); } } |