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/particles | |
| 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/particles')
| -rw-r--r-- | src/particles/qquickcustomparticle.cpp | 2 | ||||
| -rw-r--r-- | src/particles/qquickparticlepainter.cpp | 14 | ||||
| -rw-r--r-- | src/particles/qquickparticlepainter_p.h | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp index 777237a32b..31b95c41fe 100644 --- a/src/particles/qquickcustomparticle.cpp +++ b/src/particles/qquickcustomparticle.cpp @@ -466,7 +466,7 @@ void QQuickCustomParticle::commit(int gIdx, int pIdx) void QQuickCustomParticle::itemChange(ItemChange change, const ItemChangeData &value) { if (change == QQuickItem::ItemSceneChange) - m_common.updateCanvas(value.canvas); + m_common.updateWindow(value.window); QQuickParticlePainter::itemChange(change, value); } diff --git a/src/particles/qquickparticlepainter.cpp b/src/particles/qquickparticlepainter.cpp index dcdbc59fe9..c27500c2d6 100644 --- a/src/particles/qquickparticlepainter.cpp +++ b/src/particles/qquickparticlepainter.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qquickparticlepainter_p.h" -#include <QQuickCanvas> +#include <QQuickWindow> #include <QDebug> QT_BEGIN_NAMESPACE /*! @@ -67,18 +67,18 @@ QT_BEGIN_NAMESPACE */ QQuickParticlePainter::QQuickParticlePainter(QQuickItem *parent) : QQuickItem(parent), - m_system(0), m_count(0), m_pleaseReset(true), m_canvas(0) + m_system(0), m_count(0), m_pleaseReset(true), m_window(0) { } void QQuickParticlePainter::itemChange(ItemChange change, const ItemChangeData &data) { if (change == QQuickItem::ItemSceneChange) { - if (m_canvas) - disconnect(m_canvas, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated())); - m_canvas = data.canvas; - if (m_canvas) - connect(m_canvas, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()), Qt::DirectConnection); + if (m_window) + disconnect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated())); + m_window = data.window; + if (m_window) + connect(m_window, SIGNAL(sceneGraphInvalidated()), this, SLOT(sceneGraphInvalidated()), Qt::DirectConnection); } } diff --git a/src/particles/qquickparticlepainter_p.h b/src/particles/qquickparticlepainter_p.h index 1ae4625856..af10e9fcf7 100644 --- a/src/particles/qquickparticlepainter_p.h +++ b/src/particles/qquickparticlepainter_p.h @@ -126,7 +126,7 @@ protected: QStringList m_groups; QPointF m_systemOffset; - QQuickCanvas *m_canvas; + QQuickWindow *m_window; private: QSet<QPair<int,int> > m_pendingCommits; |