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/plugins | |
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/plugins')
-rw-r--r-- | src/plugins/accessible/quick/qaccessiblequickitem.cpp | 26 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp | 6 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp index c5a45e2085..c1307bb643 100644 --- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp @@ -70,14 +70,14 @@ QRect QAccessibleQuickItem::rect() const QRect QAccessibleQuickItem::viewRect() const { - // ### no canvas in some cases. - if (!item()->canvas()) { + // ### no window in some cases. + if (!item()->window()) { return QRect(); } - QQuickCanvas *canvas = item()->canvas(); - QPoint screenPos = canvas->mapToGlobal(QPoint(0,0)); - return QRect(screenPos, canvas->size()); + QQuickWindow *window = item()->window(); + QPoint screenPos = window->mapToGlobal(QPoint(0,0)); + return QRect(screenPos, window->size()); } @@ -91,14 +91,14 @@ QAccessibleInterface *QAccessibleQuickItem::parent() const { QQuickItem *parent = item()->parentItem(); if (parent) { - QQuickCanvas *canvas = item()->canvas(); + QQuickWindow *window = item()->window(); // Jump out to the scene widget if the parent is the root item. - // There are two root items, QQuickCanvas::rootItem and + // There are two root items, QQuickWindow::rootItem and // QQuickView::declarativeRoot. The former is the true root item, // but is not a part of the accessibility tree. Check if we hit // it here and return an interface for the scene instead. - if (canvas && (parent == canvas->rootItem())) { - return QAccessible::queryAccessibleInterface(canvas); + if (window && (parent == window->contentItem())) { + return QAccessible::queryAccessibleInterface(window); } else { return QAccessible::queryAccessibleInterface(parent); } @@ -154,7 +154,7 @@ QAccessible::State QAccessibleQuickItem::state() const if (item()->hasActiveFocus()) state.focused = true; - if (!item()->canvas() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) + if (!item()->window() ||!item()->isVisible() || qFuzzyIsNull(item()->opacity())) state.invisible = true; QAccessible::Role r = role(); @@ -274,9 +274,9 @@ QVariant QAccessibleQuickItemValueInterface::minimumValue() const */ QRect itemScreenRect(QQuickItem *item) { - // ### no canvas in some cases. + // ### no window in some cases. // ### Should we really check for 0 opacity? - if (!item->canvas() ||!item->isVisible() || qFuzzyIsNull(item->opacity())) { + if (!item->window() ||!item->isVisible() || qFuzzyIsNull(item->opacity())) { return QRect(); } @@ -291,7 +291,7 @@ QRect itemScreenRect(QQuickItem *item) } QPointF scenePoint = item->mapToScene(QPointF(0, 0)); - QPoint screenPos = item->canvas()->mapToGlobal(scenePoint.toPoint()); + QPoint screenPos = item->window()->mapToGlobal(scenePoint.toPoint()); return QRect(screenPos, itemSize); } diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp index a2ec34ef07..a8fcace877 100644 --- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp +++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp @@ -44,7 +44,7 @@ #include <QtCore/QTimer> #include <QtGui/QPainter> #include <QtGui/QStaticText> -#include <QtQuick/QQuickCanvas> +#include <QtQuick/QQuickWindow> namespace QmlJSDebugger { namespace QtQuick2 { @@ -81,7 +81,7 @@ void Highlight::setItem(QQuickItem *item) connect(item, SIGNAL(transformOriginChanged(TransformOrigin)), SLOT(adjust())); } - QQuickCanvas *view = item->canvas(); + QQuickWindow *view = item->window(); QQuickItem * rootItem = view->rootItem(); if (rootItem) { connect(rootItem, SIGNAL(xChanged()), SLOT(adjust())); @@ -110,7 +110,7 @@ void Highlight::adjust() setSize(QSizeF(m_item->width(), m_item->height())); qreal scaleFactor = 1; QPointF originOffset = QPointF(0,0); - QQuickCanvas *view = m_item->canvas(); + QQuickWindow *view = m_item->window(); if (view->rootItem()) { scaleFactor = view->rootItem()->scale(); originOffset -= view->rootItem()->pos(); |