summaryrefslogtreecommitdiffstats
path: root/src/android/jar
diff options
context:
space:
mode:
authorPetri Virkkunen <petri.virkkunen@qt.io>2024-02-22 11:11:32 +0200
committerPetri Virkkunen <petri.virkkunen@qt.io>2024-02-22 14:37:42 +0200
commit14851471eefb8708a52981532ebaeed87509381f (patch)
tree07b9413c6ffc5a07f3084e206cb2a7ee226e4295 /src/android/jar
parent3275050df41e1dd16d3db0423816dd2955e596ab (diff)
Do not register focus listener for null view in QtEmbeddedDelegate
A null view can not be focused. Pick-to: 6.7 Change-Id: I0564dd554a304e2e60e3ae83c4782ac348edcd9b Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
Diffstat (limited to 'src/android/jar')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
index 66a3f6c949..975b26b915 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtEmbeddedDelegate.java
@@ -135,7 +135,8 @@ class QtEmbeddedDelegate extends QtActivityDelegateBase implements QtNative.AppS
void setView(QtView view) {
m_view = view;
- registerGlobalFocusChangeListener(m_view);
+ if (m_view != null)
+ registerGlobalFocusChangeListener(m_view);
}
public void setRootWindowRef(long ref) {