diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-07-11 17:32:16 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 07:26:15 +0200 |
| commit | feb996e3ab44e68082c97102556ea396f5df3f44 (patch) | |
| tree | 7613a8a4eaf5a8e0fb2801e9d0d9d1869524c348 /tests/auto/quick/qquickvisualdatamodel | |
| parent | 68bbdacd2d5a6fa02f085a996411fb2b71875174 (diff) | |
QQuickCanvas renames
QQuickCanvas is now called QQuickWindow
QQuickCanvas::rootItem is now QQuickWindow::contentItem
QQuickItem::canvas is now QQuickItem::window
QQuickItem::ItemChangeData::canvas is also renamed window
QQuickCanvas::grabFrameBuffer is now QQuickWindow::grabWindow
The functions related to the color property have dropped the clear from
their names.
The first three changes have interim compatibility measures in place to
ease the transition.
Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d2
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/quick/qquickvisualdatamodel')
| -rw-r--r-- | tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 54871c1bdc..2b0459669f 100644 --- a/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -2646,14 +2646,14 @@ void tst_qquickvisualdatamodel::insert() QFETCH(QString, property); QFETCH(QStringList, propertyData); - QQuickCanvas canvas; + QQuickWindow window; QQmlComponent component(&engine); component.loadUrl(source); QScopedPointer<QObject> object(component.create()); QQuickListView *listView = qobject_cast<QQuickListView *>(object.data()); QVERIFY(listView); - listView->setParentItem(canvas.rootItem()); + listView->setParentItem(window.rootItem()); QQuickItem *contentItem = listView->contentItem(); QVERIFY(contentItem); @@ -3110,14 +3110,14 @@ void tst_qquickvisualdatamodel::resolve() QFETCH(QString, property); QFETCH(QStringList, propertyData); - QQuickCanvas canvas; + QQuickWindow window; QQmlComponent component(&engine); component.loadUrl(source); QScopedPointer<QObject> object(component.create()); QQuickListView *listView = qobject_cast<QQuickListView *>(object.data()); QVERIFY(listView); - listView->setParentItem(canvas.rootItem()); + listView->setParentItem(window.rootItem()); QQuickItem *contentItem = listView->contentItem(); QVERIFY(contentItem); @@ -3510,14 +3510,14 @@ void tst_qquickvisualdatamodel::warnings() QFETCH(QString, warning); QFETCH(int, count); - QQuickCanvas canvas; + QQuickWindow window; QQmlComponent component(&engine); component.loadUrl(source); QScopedPointer<QObject> object(component.create()); QQuickListView *listView = qobject_cast<QQuickListView *>(object.data()); QVERIFY(listView); - listView->setParentItem(canvas.rootItem()); + listView->setParentItem(window.rootItem()); QQuickItem *contentItem = listView->contentItem(); QVERIFY(contentItem); |