diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:13:14 +0200 |
| commit | 1e472c6c1aafd893eebf29929b36b77c42c0e199 (patch) | |
| tree | 5d63cff70bc21e0ead4135347cc87e65e864f824 /src/quicktemplates2/qquickpopup.cpp | |
| parent | 44dd55be23138f0a6495b08818acaaa0ff68b086 (diff) | |
| parent | ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Iba044084bf82f6b2b8ceba4aa2a80bdcf8fc38e0
Diffstat (limited to 'src/quicktemplates2/qquickpopup.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickpopup.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickpopup.cpp b/src/quicktemplates2/qquickpopup.cpp index 406c513f..59a9a6dc 100644 --- a/src/quicktemplates2/qquickpopup.cpp +++ b/src/quicktemplates2/qquickpopup.cpp @@ -304,7 +304,7 @@ bool QQuickPopupPrivate::acceptTouch(const QTouchEvent::TouchPoint &point) if (point.id() == touchId) return true; - if (touchId == -1 && point.state() == Qt::TouchPointPressed) { + if (touchId == -1 && point.state() != Qt::TouchPointReleased) { touchId = point.id(); return true; } |