diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-20 01:00:08 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2019-03-20 14:09:30 +0100 |
| commit | 6893919b0c4cddfbd82ebf963cc7bebde816b1b3 (patch) | |
| tree | 9bfa1b57707fe609f9401c5b3bd5cd85ec1ae777 /src/widgets/kernel/qgesturemanager.cpp | |
| parent | 3ca05b2a2e80863202bdb6a225f72debbb28b8fe (diff) | |
| parent | 2bafd997ee515d3b6a6a8fb030e1265a4713713e (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/gui/kernel/qplatformintegration.cpp
src/gui/kernel/qplatformintegration.h
src/plugins/platforms/wasm/qwasmintegration.cpp
src/plugins/platforms/xcb/qxcbconnection_screens.cpp
Change-Id: I15063d42e9a1e226d9d2d2d372f75141b84c5c1b
Diffstat (limited to 'src/widgets/kernel/qgesturemanager.cpp')
| -rw-r--r-- | src/widgets/kernel/qgesturemanager.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index 57d6994c88..cd27c9c5be 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -143,11 +143,6 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type) { QList<QGestureRecognizer *> list = m_recognizers.values(type); - while (QGestureRecognizer *recognizer = m_recognizers.take(type)) { - // ensuring an entry exists causes the recognizer to be deleted on destruction of the manager - auto &gestures = m_obsoleteGestures[recognizer]; - Q_UNUSED(gestures); - } foreach (QGesture *g, m_gestureToRecognizer.keys()) { QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g); if (list.contains(recognizer)) { |