From 056a35d02f683dba8deba5345477987c451c189c Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Tue, 24 Jan 2017 18:00:16 +0100
Subject: Fix build with -no-feature-menu

Change-Id: I8f9d5ef6b7f7102e56816677f1d3a5b5144b7083
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/accessible/qaccessiblewidgets.cpp | 2 ++
 src/widgets/accessible/simplewidgets.cpp      | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index b814762168..4c48ecb465 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -85,7 +85,9 @@ QList<QWidget*> childWidgets(const QWidget *widget)
         QString objectName = w->objectName();
         if (!w->isWindow()
               && !qobject_cast<QFocusFrame*>(w)
+#if QT_CONFIG(menu)
               && !qobject_cast<QMenu*>(w)
+#endif
               && objectName != QLatin1String("qt_rubberband")
               && objectName != QLatin1String("qt_qmainwindow_extended_splitter")) {
             widgets.append(w);
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index e6fda103fb..0cfa9bfbb2 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -339,10 +339,12 @@ QStringList QAccessibleToolButton::actionNames() const
 {
     QStringList names;
     if (widget()->isEnabled()) {
+#if QT_CONFIG(menu)
         if (toolButton()->menu())
             names << showMenuAction();
         if (toolButton()->popupMode() != QToolButton::InstantPopup)
             names << QAccessibleButton::actionNames();
+#endif
     }
     return names;
 }
@@ -355,12 +357,12 @@ void QAccessibleToolButton::doAction(const QString &actionName)
     if (actionName == pressAction()) {
         button()->click();
     } else if (actionName == showMenuAction()) {
+#if QT_CONFIG(menu)
         if (toolButton()->popupMode() != QToolButton::InstantPopup) {
             toolButton()->setDown(true);
-#ifndef QT_NO_MENU
             toolButton()->showMenu();
-#endif
         }
+#endif
     } else {
         QAccessibleButton::doAction(actionName);
     }
-- 
cgit v1.2.3