diff options
| author | Tarja Sundqvist <[email protected]> | 2023-06-09 17:08:47 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <[email protected]> | 2023-06-09 17:08:47 +0300 |
| commit | 960a980dc885622cb84990c4da75d5060318302d (patch) | |
| tree | b02009bb0e08ec4f94f2ef1d4318679700347d9a /src/quick/items/qquickflickable_p_p.h | |
| parent | 540c4e4a5def8c350a49bb68380b787ae62490c6 (diff) | |
| parent | cecf9b52904ab790e1a531698e9c5e33585227f0 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: I7b6e0ef657d1278405738f682b2795f8c345c3d4
Diffstat (limited to 'src/quick/items/qquickflickable_p_p.h')
| -rw-r--r-- | src/quick/items/qquickflickable_p_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h index 6163613493..d5d838eaea 100644 --- a/src/quick/items/qquickflickable_p_p.h +++ b/src/quick/items/qquickflickable_p_p.h @@ -109,6 +109,7 @@ public: , fixingUp(false), inOvershoot(false), inRebound(false), moving(false), flicking(false) , dragging(false), extentsChanged(false) , explicitValue(false), minExtentDirty(true), maxExtentDirty(true) + , contentPositionChangedExternallyDuringDrag(false) , unused(0) {} @@ -169,7 +170,8 @@ public: bool explicitValue : 1; mutable bool minExtentDirty : 1; mutable bool maxExtentDirty : 1; - uint unused : 19; + bool contentPositionChangedExternallyDuringDrag : 1; + uint unused : 18; }; bool flickX(qreal velocity); |