summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativetextinput.cpp
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-05-28 04:06:41 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-05-28 04:21:16 (GMT)
commit0da153d47da2dcc59b33bc47ea949ceaf3189579 (patch)
tree45a4b4747085b6fd13fca31d78c2790bd3ef6ce5 /src/declarative/graphicsitems/qdeclarativetextinput.cpp
parent79a587d813c2df9c45fea7423e5e6c40e2d2b67b (diff)
downloadQt-0da153d47da2dcc59b33bc47ea949ceaf3189579.zip
Qt-0da153d47da2dcc59b33bc47ea949ceaf3189579.tar.gz
Qt-0da153d47da2dcc59b33bc47ea949ceaf3189579.tar.bz2
Active window focus gain should not open virtual keypad
Task-number: Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextinput.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 18e3595..9c70ea9 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1282,7 +1282,7 @@ void QDeclarativeTextInput::setShowInputPanelOnFocus(bool showOnFocus)
void QDeclarativeTextInput::focusInEvent(QFocusEvent *event)
{
Q_D(const QDeclarativeTextInput);
- if (d->showInputPanelOnFocus && !isReadOnly()) {
+ if (d->showInputPanelOnFocus && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) {
openSoftwareInputPanel();
}
QDeclarativePaintedItem::focusInEvent(event);