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/context2d/qquickcanvasitem_p.h | |
| 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/context2d/qquickcanvasitem_p.h')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index 090c763e46..4e592bcba7 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -60,8 +60,8 @@ class QQuickPixmap; class QQuickCanvasPixmap : public QQmlRefCount { public: - QQuickCanvasPixmap(const QImage& image, QQuickCanvas *canvas); - QQuickCanvasPixmap(QQuickPixmap *pixmap, QQuickCanvas *canvas); + QQuickCanvasPixmap(const QImage& image, QQuickWindow *window); + QQuickCanvasPixmap(QQuickPixmap *pixmap, QQuickWindow *window); ~QQuickCanvasPixmap(); QSGTexture *texture(); @@ -76,7 +76,7 @@ private: QQuickPixmap *m_pixmap; QImage m_image; QSGTexture *m_texture; - QQuickCanvas *m_canvas; + QQuickWindow *m_window; }; class QQuickCanvasItem : public QQuickItem @@ -209,4 +209,4 @@ QML_DECLARE_TYPE(QQuickCanvasItem) QT_END_HEADER -#endif //QQUICKCANVASITEM_P_H
\ No newline at end of file +#endif //QQUICKCANVASITEM_P_H |