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 /src/quick/items/items.pri | |
| 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 'src/quick/items/items.pri')
| -rw-r--r-- | src/quick/items/items.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri index 9f205ed503..3130106c5c 100644 --- a/src/quick/items/items.pri +++ b/src/quick/items/items.pri @@ -8,8 +8,9 @@ HEADERS += \ $$PWD/qquickitemchangelistener_p.h \ $$PWD/qquickrectangle_p.h \ $$PWD/qquickrectangle_p_p.h \ + $$PWD/qquickwindow.h \ + $$PWD/qquickwindow_p.h \ $$PWD/qquickcanvas.h \ - $$PWD/qquickcanvas_p.h \ $$PWD/qquickfocusscope_p.h \ $$PWD/qquickitemsmodule_p.h \ $$PWD/qquickpainteditem.h \ @@ -82,7 +83,7 @@ SOURCES += \ $$PWD/qquickanchors.cpp \ $$PWD/qquickitem.cpp \ $$PWD/qquickrectangle.cpp \ - $$PWD/qquickcanvas.cpp \ + $$PWD/qquickwindow.cpp \ $$PWD/qquickfocusscope.cpp \ $$PWD/qquickitemsmodule.cpp \ $$PWD/qquickpainteditem.cpp \ |