summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2012-01-23 16:34:33 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-25 22:35:12 +0100
commit4dae8c1aff6a4d83fdabe366c6711df7ff867887 (patch)
tree5aea38f9b1f5fe701bf8c1d8ee63c88a5148c1fd /tests/auto/widgets/graphicsview
parentaee1f6cc413f56bf4962324799ee3887c3dd037f (diff)
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 <lars.knoll@nokia.com>
Diffstat (limited to 'tests/auto/widgets/graphicsview')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp8
1 files changed, 4 insertions, 4 deletions
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<QTextControl> control = item->textControl();
+ QPointer<QWidgetTextControl> control = item->textControl();
delete item;
QVERIFY(!control);
item = new QGraphicsTextItem;
- QPointer<QTextControl> oldControl = control;
- control = new QTextControl;
+ QPointer<QWidgetTextControl> 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());