diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2011-09-23 15:28:19 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-28 14:02:08 +0200 |
| commit | 3d71266fea91628d28ae4e55cd105a0bd5d8b457 (patch) | |
| tree | 97dd3a62e57ca0e605571aab90d49fb4ca4418a3 /tests/auto/qgraphicsscene | |
| parent | d0968472c6fc3a9648caa864db39c67db57cef0d (diff) | |
Remove support for QWidget specific input contexts
QInputContext is migrated to QInputPanel, which allows only one
instance.
Change-Id: I4912164790d5a6bdff41e11cbe4bc4e2f9f111ec
Reviewed-on: http://codereview.qt-project.org/5641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/qgraphicsscene')
| -rw-r--r-- | tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp index 910f0bb688..b4c419a4f6 100644 --- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp +++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp @@ -3867,21 +3867,21 @@ void tst_QGraphicsScene::inputMethod() QGraphicsScene scene; QGraphicsView view(&scene); - TestInputContext inputContext; - view.setInputContext(&inputContext); + TestInputContext *inputContext = new TestInputContext; + qApp->setInputContext(inputContext); view.show(); QApplication::setActiveWindow(&view); view.setFocus(); QTest::qWaitForWindowShown(&view); QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view)); - inputContext.resetCalls = 0; + inputContext->resetCalls = 0; scene.addItem(item); QInputMethodEvent event; scene.setFocusItem(item); QCOMPARE(!!(item->flags() & QGraphicsItem::ItemIsFocusable), scene.focusItem() == item); - QCOMPARE(inputContext.resetCalls, 0); + QCOMPARE(inputContext->resetCalls, 0); item->eventCalls = 0; qApp->sendEvent(&scene, &event); @@ -3894,7 +3894,7 @@ void tst_QGraphicsScene::inputMethod() scene.setFocusItem(0); // the input context is reset twice, once because an item has lost focus and again because // the Qt::WA_InputMethodEnabled flag is cleared because no item has focus. - QCOMPARE(inputContext.resetCalls, callFocusItem ? 2 : 0); + QCOMPARE(inputContext->resetCalls, callFocusItem ? 2 : 0); QCOMPARE(item->eventCalls, callFocusItem ? 2 : 0); // verify correct delivery of "reset" event QCOMPARE(item->queryCalls, callFocusItem ? 1 : 0); // verify that value is unaffected |