3 files changed, 18 insertions, 12 deletions
diff --git a/src/plugins/platforms/android/src/androidjnimenu.cpp b/src/plugins/platforms/android/src/androidjnimenu.cpp
index 8964995832..866acd3c7e 100644
--- a/src/plugins/platforms/android/src/androidjnimenu.cpp
+++ b/src/plugins/platforms/android/src/androidjnimenu.cpp
@@ -41,13 +41,14 @@
 
 #include "androidjnimenu.h"
 #include "androidjnimain.h"
-#include <qmutex.h>
-#include <qset.h>
-#include <qqueue.h>
-#include <android/log.h>
 #include "qandroidplatformmenubar.h"
 #include "qandroidplatformmenu.h"
-#include <qandroidplatformmenuitem.h>
+#include "qandroidplatformmenuitem.h"
+
+#include <QMutex>
+#include <QSet>
+#include <QQueue>
+#include <QWindow>
 
 using namespace QtAndroid;
 
@@ -141,18 +142,17 @@ namespace QtAndroidMenu
 
     void setActiveTopLevelWindow(QWindow *window)
     {
+        Qt::WindowFlags flags = window->flags();
+        bool isNonRegularWindow = flags & (Qt::Desktop | Qt::Popup | Qt::Dialog | Qt::Sheet) & ~Qt::Window;
+        if (isNonRegularWindow)
+            return;
+
         QMutexLocker lock(&menuBarMutex);
         if (activeTopLevelWindow == window)
             return;
 
         visibleMenuBar = 0;
         activeTopLevelWindow = window;
-#ifdef ANDROID_PLUGIN_OPENGL
-        //only one toplevel window, so the menu bar always belongs to us
-        if (menuBars.size() == 1) {
-            visibleMenuBar = *menuBars.constBegin(); //since QSet doesn't have first()
-        } else
-#endif
         foreach (QAndroidPlatformMenuBar *menuBar, menuBars) {
             if (menuBar->parentWindow() == window) {
                 visibleMenuBar = menuBar;
@@ -173,8 +173,10 @@ namespace QtAndroidMenu
     {
         QMutexLocker lock(&menuBarMutex);
         menuBars.remove(menuBar);
-        if (visibleMenuBar == menuBar)
+        if (visibleMenuBar == menuBar) {
+            visibleMenuBar = 0;
             resetMenuBar();
+        }
     }
 
     static QString removeAmpersandEscapes(QString s)
diff --git a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformscreen.cpp b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformscreen.cpp
index 821fd954df..de4075feff 100644
--- a/src/plugins/platforms/android/src/opengl/qandroidopenglplatformscreen.cpp
+++ b/src/plugins/platforms/android/src/opengl/qandroidopenglplatformscreen.cpp
@@ -41,6 +41,7 @@
 
 #include "qandroidopenglplatformscreen.h"
 #include "qandroidopenglplatformwindow.h"
+#include "androidjnimenu.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -51,6 +52,7 @@ QAndroidOpenGLPlatformScreen::QAndroidOpenGLPlatformScreen(EGLDisplay display)
 
 void QAndroidOpenGLPlatformScreen::topWindowChanged(QPlatformWindow *window)
 {
+    QtAndroidMenu::setActiveTopLevelWindow(window->window());
     QAndroidOpenGLPlatformWindow *platformWindow = static_cast<QAndroidOpenGLPlatformWindow *>(window);
     if (platformWindow != 0)
         platformWindow->updateStatusBarVisibility();
diff --git a/src/plugins/platforms/android/src/qandroidplatformmenubar.cpp b/src/plugins/platforms/android/src/qandroidplatformmenubar.cpp
index ef1ac61356..134062fb32 100644
--- a/src/plugins/platforms/android/src/qandroidplatformmenubar.cpp
+++ b/src/plugins/platforms/android/src/qandroidplatformmenubar.cpp
@@ -79,6 +79,8 @@ void QAndroidPlatformMenuBar::syncMenu(QPlatformMenu *menu)
 
 void QAndroidPlatformMenuBar::handleReparent(QWindow *newParentWindow)
 {
+    if (m_parentWindow == newParentWindow)
+        return;
     m_parentWindow = newParentWindow;
     QtAndroidMenu::setMenuBar(this, newParentWindow);
 }