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/qml/doc | |
| 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/qml/doc')
| -rw-r--r-- | src/qml/doc/src/cppclasses/component.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/documents/networktransparency.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppclasses/component.qdoc b/src/qml/doc/src/cppclasses/component.qdoc index cc4f6b5f1c..8eb22283b4 100644 --- a/src/qml/doc/src/cppclasses/component.qdoc +++ b/src/qml/doc/src/cppclasses/component.qdoc @@ -34,7 +34,7 @@ A QML document can be loaded with QQmlComponent or QQuickView. QQmlComponent loads a QML component as a C++ QObject; QQuickView also does this, but additionally loads the QML component - directly into a QQuickCanvas which displays visual QML object types + directly into a QQuickWindow which displays visual QML object types provided by Qt Quick, or object types derived from those. It is convenient for loading a displayable QML component as a root QWindow. diff --git a/src/qml/doc/src/documents/networktransparency.qdoc b/src/qml/doc/src/documents/networktransparency.qdoc index dd83813366..b3ded04520 100644 --- a/src/qml/doc/src/documents/networktransparency.qdoc +++ b/src/qml/doc/src/documents/networktransparency.qdoc @@ -93,8 +93,8 @@ the executable using \l{The Qt Resource System}. Using this, an executable can r that is compiled into the executable: \code - QQuickView *canvas = new QQuickView; - canvas->setUrl(QUrl("qrc:/dial.qml")); + QQuickView *view = new QQuickView; + view->setUrl(QUrl("qrc:/dial.qml")); \endcode The content itself can then use relative URLs, and so be transparently unaware that the content is |