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/qquickscreen.cpp | |
| 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/qquickscreen.cpp')
| -rw-r--r-- | src/quick/items/qquickscreen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index a55cb1f105..32b0d321db 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.cpp @@ -43,7 +43,7 @@ #include "qquickitem.h" #include "qquickitem_p.h" -#include "qquickcanvas.h" +#include "qquickwindow.h" #include <QScreen> @@ -108,8 +108,8 @@ QQuickScreenAttached::QQuickScreenAttached(QObject* attachee) if (m_attachee) { QQuickItemPrivate::get(m_attachee)->extra.value().screenAttached = this; - if (m_attachee->canvas()) //It might not be assigned to a canvas yet - canvasChanged(m_attachee->canvas()); + if (m_attachee->window()) //It might not be assigned to a window yet + windowChanged(m_attachee->window()); } } @@ -148,7 +148,7 @@ int QQuickScreenAttached::angleBetween(int a, int b) return m_screen->angleBetween((Qt::ScreenOrientation)a,(Qt::ScreenOrientation)b); } -void QQuickScreenAttached::canvasChanged(QQuickCanvas* c)//Called by QQuickItemPrivate::initCanvas +void QQuickScreenAttached::windowChanged(QQuickWindow* c)//Called by QQuickItemPrivate::initWindow { QScreen* screen = c ? c->screen() : 0; if (screen != m_screen) { |