diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-20 01:00:12 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-20 09:37:57 +0100 |
| commit | 67ac9dead884c7558896bdd97e4d3152100dc7ec (patch) | |
| tree | 000ef894b1f7d649b293cd08c2d8235f72201f19 /src/quick/items/qquickitemview_p_p.h | |
| parent | e5f7c5f2712957d0e1753c629e4cce86a0e6bdbc (diff) | |
| parent | 953e04346773beb5d10c3758a12aae5c82646ae1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/quick/items/qquickitemview.cpp
Change-Id: Ib9faebdbef5eebb80f4e6aeb5b15b5df7494b157
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 48f47a356b..0bc2a6b768 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -323,6 +323,7 @@ public: bool inRequest : 1; bool runDelayedRemoveTransition : 1; bool delegateValidated : 1; + bool isClearing : 1; protected: virtual Qt::Orientation layoutOrientation() const = 0; |