diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:27:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 22:27:26 +0200 |
| commit | ead7aea128d81118886721585058b45f037f5613 (patch) | |
| tree | d04f8bce4221d7aa40b6e4ef64a28c193a12fa07 /src/quick/items/qquickitem_p.h | |
| parent | 7e742bff27491b5ecd8713540940683264c240a2 (diff) | |
| parent | 5f4299eb597b89df20189a5c5a6235287e54b636 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4qobjectwrapper.cpp
Change-Id: I1a125b2334532ec5de4af39c0d6628890f4d0587
Diffstat (limited to 'src/quick/items/qquickitem_p.h')
| -rw-r--r-- | src/quick/items/qquickitem_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 7a39b7c4c7..c892ec9144 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -474,7 +474,6 @@ public: inline QSGRenderContext *sceneGraphRenderContext() const; QQuickItem *parentItem; - QQmlNotifier parentNotifier; QList<QQuickItem *> childItems; mutable QList<QQuickItem *> *sortedChildItems; |