diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-15 10:19:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-15 10:19:38 +0100 |
| commit | c9260cd940fe9ca0e440b715cbfc13dd046e07b0 (patch) | |
| tree | 9e4a97453f79dc7cf25434785e72920172535afd /src/quicktemplates2/qquickcontrol_p_p.h | |
| parent | 8f9f0508e4f3469ae56874fcecc89023b51c2a75 (diff) | |
| parent | 025f938c1b4676782674d54375e1e4e560e4b6cd (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
tests/auto/qquickpopup/tst_qquickpopup.cpp
Change-Id: Id3bca2da290234f3c69845ffe18c6d9193a1bd28
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index b649db0a..fa06c97f 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -230,7 +230,9 @@ public: bool explicitHoverEnabled = false; #endif bool resizingBackground = false; + bool pressWasTouch = false; int touchId = -1; + QPointF previousPressPos; qreal padding = 0; qreal horizontalPadding = 0; qreal verticalPadding = 0; |