diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 19:27:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 19:27:37 (GMT) |
| commit | f6d3753892353e6064fa1fc3c4bf0ba2fad900a6 (patch) | |
| tree | 2231dfabee6314a5fa1e9d8cab12a7ed8436e254 /src/declarative/graphicsitems/qdeclarativetextinput.cpp | |
| parent | a66efc054ce9a9b2fc0535a7269f921ea411498c (diff) | |
| parent | 66410ec9be30b09d6b61554d091c3f9907745787 (diff) | |
| download | Qt-f6d3753892353e6064fa1fc3c4bf0ba2fad900a6.zip Qt-f6d3753892353e6064fa1fc3c4bf0ba2fad900a6.tar.gz Qt-f6d3753892353e6064fa1fc3c4bf0ba2fad900a6.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:
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/qdeclarativetextinput.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 1202101..3911a97 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -1333,7 +1333,7 @@ void QDeclarativeTextInput::focusInEvent(QFocusEvent *event) { Q_D(const QDeclarativeTextInput); if (d->showInputPanelOnFocus) { - if (d->focusOnPress && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) { + if (d->focusOnPress && !isReadOnly()) { openSoftwareInputPanel(); } } |