Forward menu button events to Qt if there is no visible menubar.

Task-number: QTBUG-32334
Change-Id: If1b4517f233b04d4c6c165cbfe62c8cf7b624c60
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/platforms/android/androidjnimenu.cpp b/src/plugins/platforms/android/androidjnimenu.cpp
index 6a979b9255..9dc8395888 100644
--- a/src/plugins/platforms/android/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/androidjnimenu.cpp
@@ -68,6 +68,7 @@ namespace QtAndroidMenu
     static jmethodID openContextMenuMethodID = 0;
     static jmethodID closeContextMenuMethodID = 0;
     static jmethodID resetOptionsMenuMethodID = 0;
+    static jmethodID openOptionsMenuMethodID = 0;
 
     static jmethodID clearMenuMethodID = 0;
     static jmethodID addMenuItemMethodID = 0;
@@ -87,6 +88,13 @@ namespace QtAndroidMenu
             env.jniEnv->CallStaticVoidMethod(applicationClass(), resetOptionsMenuMethodID);
     }
 
+    void openOptionsMenu()
+    {
+        AttachedJNIEnv env;
+        if (env.jniEnv)
+            env.jniEnv->CallStaticVoidMethod(applicationClass(), openOptionsMenuMethodID);
+    }
+
     void showContextMenu(QAndroidPlatformMenu *menu, JNIEnv *env)
     {
         QMutexLocker lock(&visibleMenuMutex);
@@ -409,6 +417,7 @@ namespace QtAndroidMenu
         GET_AND_CHECK_STATIC_METHOD(openContextMenuMethodID, appClass, "openContextMenu", "()V");
         GET_AND_CHECK_STATIC_METHOD(closeContextMenuMethodID, appClass, "closeContextMenu", "()V");
         GET_AND_CHECK_STATIC_METHOD(resetOptionsMenuMethodID, appClass, "resetOptionsMenu", "()V");
+        GET_AND_CHECK_STATIC_METHOD(openOptionsMenuMethodID, appClass, "openOptionsMenu", "()V");
 
         jclass clazz;
         FIND_AND_CHECK_CLASS("android/view/Menu");