summaryrefslogtreecommitdiffstats
path: root/src/widgets/kernel/qgesturerecognizer.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2019-03-20 14:59:24 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2019-03-20 14:59:24 +0000
commite8cb52f035d93ab4c52d7fa88ed30ad324133f65 (patch)
tree29b1d6743219134c38cb29b8565b8756bb4afa1a /src/widgets/kernel/qgesturerecognizer.cpp
parent24358aaf72e94cc0c20cb6a8af8683a9c202a51a (diff)
parent6893919b0c4cddfbd82ebf963cc7bebde816b1b3 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into refs/staging/5.13
Diffstat (limited to 'src/widgets/kernel/qgesturerecognizer.cpp')
-rw-r--r--src/widgets/kernel/qgesturerecognizer.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/kernel/qgesturerecognizer.cpp b/src/widgets/kernel/qgesturerecognizer.cpp
index 65c46a5e56..75d091ce4e 100644
--- a/src/widgets/kernel/qgesturerecognizer.cpp
+++ b/src/widgets/kernel/qgesturerecognizer.cpp
@@ -41,6 +41,7 @@
#include "private/qgesture_p.h"
#include "private/qgesturemanager_p.h"
+#include "private/qapplication_p.h"
#ifndef QT_NO_GESTURES
@@ -231,6 +232,11 @@ Qt::GestureType QGestureRecognizer::registerRecognizer(QGestureRecognizer *recog
*/
void QGestureRecognizer::unregisterRecognizer(Qt::GestureType type)
{
+ auto qAppPriv = QApplicationPrivate::instance();
+ if (!qAppPriv)
+ return;
+ if (!qAppPriv->gestureManager)
+ return;
QGestureManager::instance()->unregisterGestureRecognizer(type);
}