1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when using .NoActionBar theme.

Browse Source 
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>
This commit is contained in:
BogDan Vatra 2016-02-15 13:39:11 +02:00
parent b725f4e144
commit 1a358a052e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
View File

@ -1200,6 +1200,8 @@ public class QtActivityDelegate
private void setActionBarVisibility(boolean visible) private void setActionBarVisibility(boolean visible)
{ {
if (m_activity.getActionBar() == null)
return;
if (ViewConfiguration.get(m_activity).hasPermanentMenuKey() || !visible) if (ViewConfiguration.get(m_activity).hasPermanentMenuKey() || !visible)
m_activity.getActionBar().hide(); m_activity.getActionBar().hide();
else else