diff options
author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2011-12-13 15:25:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-02 16:56:44 +0100 |
commit | 6aa535e39f79548934a5c3a142e13bb09333296a (patch) | |
tree | 7a4c12c6ac126fbe9cbffc3b68835ebe5b2cc3da /src/quick/items/qquickcanvas_p.h | |
parent | 27a497b3a7581a0cd76407635afca91d1f42aeef (diff) |
Don't re-parent ShaderEffect source items.
ShaderEffect and ShaderEffectSource used to set themselves as
parent of and hide source items that don't already have a parent.
This was done in order to make sure the source items got a canvas.
This patch sets the canvas of the source items without re-parenting.
Task-number: QTBUG-23069
Change-Id: I24d56e6eb970590bca3adff7a61459d25e4983a0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas_p.h')
-rw-r--r-- | src/quick/items/qquickcanvas_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickcanvas_p.h b/src/quick/items/qquickcanvas_p.h index 6bb16ed075..d1921054d8 100644 --- a/src/quick/items/qquickcanvas_p.h +++ b/src/quick/items/qquickcanvas_p.h @@ -107,6 +107,7 @@ public: void initRootItem();//Currently only used if items added in QML QQuickRootItem *rootItem; + QSet<QQuickItem *> parentlessItems; QDeclarativeListProperty<QObject> data(); QQuickItem *activeFocusItem; |