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/designer/designersupport.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/designer/designersupport.h')
| -rw-r--r-- | src/quick/designer/designersupport.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index 54003cf3ba..df87a77071 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -90,16 +90,16 @@ public: ParentChanged = 0x00000800, Clip = 0x00001000, - Canvas = 0x00002000, + Window = 0x00002000, EffectReference = 0x00008000, Visible = 0x00010000, HideReference = 0x00020000, - TransformUpdateMask = TransformOrigin | Transform | BasicTransform | Position | Size | Canvas, - ComplexTransformUpdateMask = Transform | Canvas, - ContentUpdateMask = Size | Content | Smooth | Canvas, - ChildrenUpdateMask = ChildrenChanged | ChildrenStackingChanged | EffectReference | Canvas + TransformUpdateMask = TransformOrigin | Transform | BasicTransform | Position | Size | Window, + ComplexTransformUpdateMask = Transform | Window, + ContentUpdateMask = Size | Content | Smooth | Window, + ChildrenUpdateMask = ChildrenChanged | ChildrenStackingChanged | EffectReference | Window }; @@ -114,7 +114,7 @@ public: static bool isDirty(QQuickItem *referencedItem, DirtyType dirtyType); static void resetDirty(QQuickItem *referencedItem); - static QTransform canvasTransform(QQuickItem *referencedItem); + static QTransform windowTransform(QQuickItem *referencedItem); static QTransform parentTransform(QQuickItem *referencedItem); static bool isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem); |