diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
| commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
| tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/imports/layouts/qquicklayout_p.h | |
| parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
| parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/imports/layouts/qquicklayout_p.h')
| -rw-r--r-- | src/imports/layouts/qquicklayout_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/layouts/qquicklayout_p.h b/src/imports/layouts/qquicklayout_p.h index eece6f8658..113498eb2b 100644 --- a/src/imports/layouts/qquicklayout_p.h +++ b/src/imports/layouts/qquicklayout_p.h @@ -95,6 +95,7 @@ public: void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE; void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE; bool isReady() const; + void deactivateRecur(); /* QQuickItemChangeListener */ @@ -134,6 +135,7 @@ public: protected: unsigned m_isReady : 1; unsigned m_disableRearrange : 1; + unsigned m_hasItemChangeListeners : 1; // if false, we don't need to remove its item change listeners... mutable QSet<QQuickItem *> m_ignoredItems; }; |