diff options
author | BogDan Vatra <bogdan@kdab.com> | 2016-02-15 13:39:11 +0200 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2016-02-15 13:04:48 +0000 |
commit | 1a358a052e422b72039ace2f803eb80f8a7e43b3 (patch) | |
tree | bcbec44a881bcc96ec859377bb086e181028ffa6 /src | |
parent | b725f4e144006daac3a13e986e883a928736f6a9 (diff) |
Fix crash when using .NoActionBar theme.
m_activity.getActionBar() returns null when a .NoActionBar theme is
declared in AndroidManifest.xml file
Change-Id: I671891d03913209c3f9f34a6f4dd8894c20de5c2
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java index 14c7a03a36..985661bf3c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -1200,6 +1200,8 @@ public class QtActivityDelegate private void setActionBarVisibility(boolean visible) { + if (m_activity.getActionBar() == null) + return; if (ViewConfiguration.get(m_activity).hasPermanentMenuKey() || !visible) m_activity.getActionBar().hide(); else |