diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-07-06 09:18:00 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2017-07-06 08:43:46 +0000 |
| commit | df26542db1eddbcb8a92cce8a38eaa6dc9fa5990 (patch) | |
| tree | 7754e8b245140921806acee3c17aabeeb01cd44b /src/imports/shapes | |
| parent | 96ba4222f9654cae43f40f8cabfa689725bb2b1b (diff) | |
shapes: Remove componentComplete from QQuickShapePrivate
QQuickItemPrivate already has the member componentComplete.
Duplicating this breaks QQuickItem::isComponentComplete(),
which is used in Qt Quick Designer.
For this reason QQuickShape was never completed in
Qt Quick Designer.
This patch fixes the issue.
Change-Id: I30201ff5fb17282dab99a8c84182c6fb6e183134
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/imports/shapes')
| -rw-r--r-- | src/imports/shapes/qquickshape.cpp | 3 | ||||
| -rw-r--r-- | src/imports/shapes/qquickshape_p_p.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/imports/shapes/qquickshape.cpp b/src/imports/shapes/qquickshape.cpp index 1054af30de..666ed4e595 100644 --- a/src/imports/shapes/qquickshape.cpp +++ b/src/imports/shapes/qquickshape.cpp @@ -638,8 +638,7 @@ void QQuickShapePath::resetFillGradient() */ QQuickShapePrivate::QQuickShapePrivate() - : componentComplete(true), - spChanged(false), + : spChanged(false), rendererType(QQuickShape::UnknownRenderer), async(false), status(QQuickShape::Null), diff --git a/src/imports/shapes/qquickshape_p_p.h b/src/imports/shapes/qquickshape_p_p.h index 888488efcd..dc62994af2 100644 --- a/src/imports/shapes/qquickshape_p_p.h +++ b/src/imports/shapes/qquickshape_p_p.h @@ -177,7 +177,6 @@ public: static QQuickShapePrivate *get(QQuickShape *item) { return item->d_func(); } - bool componentComplete; bool spChanged; QQuickShape::RendererType rendererType; bool async; |