From 3d71266fea91628d28ae4e55cd105a0bd5d8b457 Mon Sep 17 00:00:00 2001 From: Pekka Vuorela Date: Fri, 23 Sep 2011 15:28:19 +0300 Subject: 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 Reviewed-by: Lars Knoll --- tests/auto/qwidget/tst_qwidget.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'tests/auto/qwidget/tst_qwidget.cpp') diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 1414123296..f7d3e465df 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -589,21 +589,11 @@ void tst_QWidget::getSetCheck() QCOMPARE(true, obj1.acceptDrops()); // QInputContext * QWidget::inputContext() - // void QWidget::setInputContext(QInputContext *) MyInputContext *var13 = new MyInputContext; - obj1.setInputContext(var13); + qApp->setInputContext(var13); QCOMPARE((QInputContext *)0, obj1.inputContext()); // The widget by default doesn't have the WA_InputMethodEnabled attribute obj1.setAttribute(Qt::WA_InputMethodEnabled); - obj1.setInputContext(var13); QCOMPARE(static_cast(var13), obj1.inputContext()); - // QWidget takes ownership, so check parent - QCOMPARE(var13->parent(), static_cast(&obj1)); - // Check self assignment - obj1.setInputContext(obj1.inputContext()); - QCOMPARE(static_cast(var13), obj1.inputContext()); - obj1.setInputContext((QInputContext *)0); - QCOMPARE(qApp->inputContext(), obj1.inputContext()); - QVERIFY(qApp->inputContext() != var13); // bool QWidget::autoFillBackground() // void QWidget::setAutoFillBackground(bool) @@ -9937,7 +9927,7 @@ void tst_QWidget::focusProxyAndInputMethods() InputContextTester *inputContext = new InputContextTester; QWidget *toplevel = new QWidget(0, Qt::X11BypassWindowManagerHint); toplevel->setAttribute(Qt::WA_InputMethodEnabled, true); - toplevel->setInputContext(inputContext); // ownership is transferred + qApp->setInputContext(inputContext); // ownership is transferred QWidget *child = new QWidget(toplevel); child->setFocusProxy(toplevel); -- cgit v1.2.3