diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 08:17:02 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-16 08:17:02 (GMT) |
| commit | 8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d (patch) | |
| tree | c328303e395088f88ba721e96bd6e09a008ad581 /src/declarative/graphicsitems/qdeclarativetextedit.cpp | |
| parent | 71e333de0c258796a924b1d858253381d689cf19 (diff) | |
| parent | bb8142436bacf5a4fa31880b58a8b3b6bc7b4d5b (diff) | |
| download | Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.zip Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.tar.gz Qt-8cb10f381af7fd6f1fa0ffc946f6a4e6ba106d5d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Conflicts:
src/plugins/imageformats/gif/qgifhandler.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextedit.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 3b4f2a7..3106daf 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -1113,13 +1113,7 @@ void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event) Q_D(QDeclarativeTextEdit); if (d->focusOnPress){ bool hadFocus = hasFocus(); - QGraphicsItem *p = parentItem();//###Is there a better way to find my focus scope? - while(p) { - if (p->flags() & QGraphicsItem::ItemIsFocusScope) - p->setFocus(); - p = p->parentItem(); - } - setFocus(true); + forceFocus(); if (d->showInputPanelOnFocus) { if (hasFocus() && hadFocus && !isReadOnly()) { // re-open input panel on press if already focused |