aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitemview_p_p.h
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-05-03 13:42:13 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-09 03:26:54 +0200
commit21311d3a352adcdb8c2e9f9c5af637e54293b6a8 (patch)
tree2976a69ac9d1b8b3024de9f25211ad38cc838de0 /src/quick/items/qquickitemview_p_p.h
parentdfc4e6f93bd2482b6eb79d7088850ceb460a1928 (diff)
Move check for whether a layout is already in progress
Move it out of applyModelChanges() into layout() since that's where it should really be checked. Change-Id: I24093e91e2ffadd5377ba44128168939e5db54c9 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
-rw-r--r--src/quick/items/qquickitemview_p_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 8fc83a99e3..5f28ac7e3a 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -293,7 +293,7 @@ public:
bool ownModel : 1;
bool wrap : 1;
- bool disableLayout : 1;
+ bool inLayout : 1;
bool inViewportMoved : 1;
bool forceLayout : 1;
bool currentIndexCleared : 1;