diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:38:37 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-17 17:38:50 (GMT) |
| commit | a61adccf96a8ceefbf1150966adda3f6d226ec6d (patch) | |
| tree | 7f01b588860f34b27f9c68146b603948d391bb8c /tests/auto/qgraphicsview/tst_qgraphicsview.cpp | |
| parent | 334b2a93d461ae9a8b258fff1971fb775b13bb68 (diff) | |
| parent | ecc202c0410125c944f156b5d0de67f093c02723 (diff) | |
| download | Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.zip Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.gz Qt-a61adccf96a8ceefbf1150966adda3f6d226ec6d.tar.bz2 | |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'tests/auto/qgraphicsview/tst_qgraphicsview.cpp')
| -rw-r--r-- | tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index f07453c..1ff06c2 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -3600,6 +3600,7 @@ void tst_QGraphicsView::inputMethodSensitivity() item->setFlag(QGraphicsItem::ItemIsFocusable); scene.addItem(item); scene.setFocusItem(item); + QCOMPARE(scene.focusItem(), item); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true); item->setFlag(QGraphicsItem::ItemAcceptsInputMethod, false); @@ -3614,27 +3615,35 @@ void tst_QGraphicsView::inputMethodSensitivity() scene.addItem(item2); scene.setFocusItem(item2); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false); + QCOMPARE(scene.focusItem(), item2); scene.setFocusItem(item); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true); + QCOMPARE(scene.focusItem(), item); view.setScene(0); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false); + QCOMPARE(scene.focusItem(), item); view.setScene(&scene); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true); + QCOMPARE(scene.focusItem(), item); scene.setFocusItem(item2); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false); + QCOMPARE(scene.focusItem(), item2); view.setScene(0); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false); + QCOMPARE(scene.focusItem(), item2); scene.setFocusItem(item); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), false); + QCOMPARE(scene.focusItem(), item); view.setScene(&scene); QCOMPARE(view.testAttribute(Qt::WA_InputMethodEnabled), true); + QCOMPARE(scene.focusItem(), item); } class InputContextTester : public QInputContext |