summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-04-11 14:38:03 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-04-12 15:06:46 +0000
commitc87757af488f2d6b4f5193413f55bcc902b0f90e (patch)
tree75e194be09704d4dd2354422345e7f832d5e0da4
parent49b60a07dc1d22c613f94348d7bef1d7a5cbf0ea (diff)
Android: wrap QAndroidInputContext's m_focusObject in a QPointer
To make sure we don't end up use a dangling pointer for m_focusObject. Task-number: QTBUG-102447 Change-Id: I75058040be109a39f830bc706efe85969ffbc8ec Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 0742e5770bb2fc133986c5151bfa18a2e8d4d231) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/plugins/platforms/android/qandroidinputcontext.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidinputcontext.h b/src/plugins/platforms/android/qandroidinputcontext.h
index e9bfb98e66..03e487eb1e 100644
--- a/src/plugins/platforms/android/qandroidinputcontext.h
+++ b/src/plugins/platforms/android/qandroidinputcontext.h
@@ -163,7 +163,7 @@ private:
QMetaObject::Connection m_updateCursorPosConnection;
HandleModes m_handleMode;
int m_batchEditNestingLevel;
- QObject *m_focusObject;
+ QPointer<QObject> m_focusObject;
QTimer m_hideCursorHandleTimer;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(QAndroidInputContext::HandleModes)