From 4dae8c1aff6a4d83fdabe366c6711df7ff867887 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Mon, 23 Jan 2012 16:34:33 +1000 Subject: Remove QTextControl and QLineControl. QtWidgets and QtDeclarative now both have their own versions of these so there's no need to keep them around any longer. Change-Id: I9c2201c8495a0a0816e2af16c8f647fcad991479 Reviewed-by: Lars Knoll --- .../auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/widgets/graphicsview') diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index c94eca5572..ad1dbc1a4d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -4243,14 +4243,14 @@ void tst_QGraphicsItem::textControlGetterSetter() { QGraphicsTextItem *item = new QGraphicsTextItem; QVERIFY(item->textControl()->parent() == item); - QPointer control = item->textControl(); + QPointer control = item->textControl(); delete item; QVERIFY(!control); item = new QGraphicsTextItem; - QPointer oldControl = control; - control = new QTextControl; + QPointer oldControl = control; + control = new QWidgetTextControl; item->setTextControl(control); QVERIFY(item->textControl() == control); @@ -4269,7 +4269,7 @@ void tst_QGraphicsItem::textControlGetterSetter() // test that on setting a control the item size // is adjusted oldControl = control; - control = new QTextControl; + control = new QWidgetTextControl; control->setPlainText("foo!"); item->setTextControl(control); QCOMPARE(item->boundingRect().size(), control->document()->documentLayout()->documentSize()); -- cgit v1.2.3