diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-12-14 11:59:45 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-12-14 11:59:45 (GMT) |
| commit | a79e7519a8109ac9065f1c3ed017c56c6e2d0810 (patch) | |
| tree | cca43017c85be2b845867fec42e459c39f479a21 | |
| parent | 3778c3f5208f3db99d6b23a2a3c4abf1fe2ec64f (diff) | |
| parent | e864a530a5c48459c433518ff6ad893f33ec93d8 (diff) | |
| download | Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.zip Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.tar.gz Qt-a79e7519a8109ac9065f1c3ed017c56c6e2d0810.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into 4.7
| -rw-r--r-- | tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index e1fbaee..e259177 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -4455,7 +4455,7 @@ class IMItem : public QGraphicsRectItem { public: IMItem(QGraphicsItem *parent = 0): - QGraphicsRectItem(mf.adjusted(-5, -5, 5, 5), parent) + QGraphicsRectItem(QRectF(0, 0, 20, 20), parent) { setFlag(QGraphicsItem::ItemIsFocusable, true); setFlag(QGraphicsItem::ItemAcceptsInputMethod, true); @@ -4486,7 +4486,7 @@ void tst_QGraphicsView::QTBUG_16063_microFocusRect() scene.setFocusItem(item); view.setFocus(); QRectF mfv = view.inputMethodQuery(Qt::ImMicroFocus).toRectF(); - QCOMPARE(mfv, QRectF(13.5, 13.6, 10, 10)); + QCOMPARE(mfv, IMItem::mf.translated(-view.mapToScene(view.sceneRect().toRect()).boundingRect().topLeft())); } QTEST_MAIN(tst_QGraphicsView) |