From 6bf9f49072233b4eef9afac2720ef282c65b6948 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Wed, 25 Jan 2017 09:38:12 +0100
Subject: Fix build with -no-feature-menubar

Change-Id: I23b23fcaf6fcc655d38a06495127b108975f4a58
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/accessible/qaccessiblemenu.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp
index 4a684e01f9..ae50bbaef0 100644
--- a/src/widgets/accessible/qaccessiblemenu.cpp
+++ b/src/widgets/accessible/qaccessiblemenu.cpp
@@ -117,7 +117,11 @@ QAccessibleInterface *QAccessibleMenu::parent() const
         parentCandidates << menu()->parentWidget();
         parentCandidates << menuAction->associatedWidgets();
         foreach (QWidget *w, parentCandidates) {
-            if (qobject_cast<QMenu*>(w) || qobject_cast<QMenuBar*>(w)) {
+            if (qobject_cast<QMenu*>(w)
+#if QT_CONFIG(menubar)
+                || qobject_cast<QMenuBar*>(w)
+#endif
+                ) {
                 if (w->actions().indexOf(menuAction) != -1)
                     return getOrCreateMenu(w, menuAction);
             }
@@ -348,13 +352,16 @@ void QAccessibleMenuItem::doAction(const QString &actionName)
     if (actionName == pressAction()) {
         m_action->trigger();
     } else if (actionName == showMenuAction()) {
+#if QT_CONFIG(menubar)
         if (QMenuBar *bar = qobject_cast<QMenuBar*>(owner())) {
             if (m_action->menu() && m_action->menu()->isVisible()) {
                 m_action->menu()->hide();
             } else {
                 bar->setActiveAction(m_action);
             }
-        } else if (QMenu *menu = qobject_cast<QMenu*>(owner())){
+        } else
+#endif
+          if (QMenu *menu = qobject_cast<QMenu*>(owner())){
             if (m_action->menu() && m_action->menu()->isVisible()) {
                 m_action->menu()->hide();
             } else {
-- 
cgit v1.2.3