diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-04 18:36:19 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-04 18:36:19 (GMT) |
| commit | f0bb9bc5b0f4c20536d6c77624bd148389b78c06 (patch) | |
| tree | 9088a173de4bfbeea29bc9464d4cb46257df67cd /src/gui/graphicsview | |
| parent | 60be72310c0f9469b3201b250b257473184ccf2a (diff) | |
| parent | 1bb5999cdca0a70df3f96d596c83c3cf7c97c5fd (diff) | |
| download | Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.zip Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.tar.gz Qt-f0bb9bc5b0f4c20536d6c77624bd148389b78c06.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'src/gui/graphicsview')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index b54596b..f93ffdf 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -9713,7 +9713,7 @@ void QGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) } QWidget *widget = event->widget(); - if (widget) { + if (widget && (dd->control->textInteractionFlags() & Qt::TextEditable) && boundingRect().contains(event->pos())) { qt_widget_private(widget)->handleSoftwareInputPanel(event->button(), dd->clickCausedFocus); } dd->clickCausedFocus = 0; |