diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-01 16:06:23 (GMT) |
| commit | f707672eb4c51ea82fbd98e1da16ece61a74c690 (patch) | |
| tree | f276d6ae14986b29cf29da411691b57d3dd47a89 /src/gui/graphicsview/qgraphicsview.cpp | |
| parent | 1c3fa677ee494f8982c99b468b4a4fcad8aa04c7 (diff) | |
| parent | 14de8cecfa5b5428d597c9cca111ee0f3f89502f (diff) | |
| download | Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.zip Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.gz Qt-f707672eb4c51ea82fbd98e1da16ece61a74c690.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/graphicsview/qgraphicsview.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index 0e2750d..488a36a 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2497,7 +2497,7 @@ QVariant QGraphicsView::inputMethodQuery(Qt::InputMethodQuery query) const else if (value.type() == QVariant::PointF) value = mapFromScene(value.toPointF()); else if (value.type() == QVariant::Rect) - value = mapFromScene(value.toRect()).boundingRect(); + value = d->mapRectFromScene(value.toRect()).toRect(); else if (value.type() == QVariant::Point) value = mapFromScene(value.toPoint()); return value; |