Merge remote-tracking branch 'origin/5.9' into 5.10

Conflicts:
	src/plugins/styles/mac/qmacstyle_mac.mm
	src/widgets/util/qcompleter.cpp
	src/widgets/widgets/qmainwindowlayout.cpp
	src/widgets/widgets/qmdisubwindow.cpp

Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973

1 files changed, 16 insertions, 15 deletions

diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp
index 60c9c43399..96b88340cd 100644
--- a/src/widgets/widgets/qtoolbutton.cpp
+++ b/src/widgets/widgets/qtoolbutton.cpp
@@ -45,19 +45,23 @@
 #include <qdrawutil.h>
 #include <qevent.h>
 #include <qicon.h>
-#include <qmenu.h>
 #include <qpainter.h>
 #include <qpointer.h>
 #include <qstyle.h>
 #include <qstyleoption.h>
 #include <qtooltip.h>
+#if QT_CONFIG(mainwindow)
 #include <qmainwindow.h>
+#endif
 #include <qtoolbar.h>
 #include <qvariant.h>
 #include <qstylepainter.h>
 #include <private/qabstractbutton_p.h>
 #include <private/qaction_p.h>
+#if QT_CONFIG(menu)
+#include <qmenu.h>
 #include <private/qmenu_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -66,7 +70,7 @@ class QToolButtonPrivate : public QAbstractButtonPrivate
     Q_DECLARE_PUBLIC(QToolButton)
 public:
     void init();
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     void _q_buttonPressed();
     void _q_buttonReleased();
     void popupTimerDone();
@@ -90,14 +94,14 @@ public:
     uint autoRaise             : 1;
     uint repeat                : 1;
     QAction *defaultAction;
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     bool hasMenu() const;
     //workaround for task 177850
     QList<QAction *> actionsCopy;
 #endif
 };
 
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
 bool QToolButtonPrivate::hasMenu() const
 {
     return ((defaultAction && defaultAction->menu())
@@ -215,7 +219,7 @@ void QToolButtonPrivate::init()
     q->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed,
                                  QSizePolicy::ToolButton));
 
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     QObject::connect(q, SIGNAL(pressed()), q, SLOT(_q_buttonPressed()));
     QObject::connect(q, SIGNAL(released()), q, SLOT(_q_buttonReleased()));
 #endif
@@ -287,7 +291,7 @@ void QToolButton::initStyleOption(QStyleOptionToolButton *option) const
         option->features |= QStyleOptionToolButton::Arrow;
     if (d->popupMode == QToolButton::DelayedPopup)
         option->features |= QStyleOptionToolButton::PopupDelay;
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     if (d->hasMenu())
         option->features |= QStyleOptionToolButton::HasMenu;
 #endif
@@ -472,7 +476,7 @@ void QToolButton::actionEvent(QActionEvent *event)
     case QEvent::ActionRemoved:
         if (d->defaultAction == action)
             d->defaultAction = 0;
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
         if (action == d->menuAction)
             d->menuAction = 0;
 #endif
@@ -551,7 +555,7 @@ void QToolButton::leaveEvent(QEvent * e)
  */
 void QToolButton::timerEvent(QTimerEvent *e)
 {
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     Q_D(QToolButton);
     if (e->timerId() == d->popupTimer.timerId()) {
         d->popupTimerDone();
@@ -590,7 +594,7 @@ void QToolButton::changeEvent(QEvent *e)
 void QToolButton::mousePressEvent(QMouseEvent *e)
 {
     Q_D(QToolButton);
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     QStyleOptionToolButton opt;
     initStyleOption(&opt);
     if (e->button() == Qt::LeftButton && (d->popupMode == MenuButtonPopup)) {
@@ -629,7 +633,7 @@ bool QToolButton::hitButton(const QPoint &pos) const
 }
 
 
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
 /*!
     Associates the given \a menu with this tool button.
 
@@ -822,10 +826,7 @@ void QToolButtonPrivate::_q_menuTriggered(QAction *action)
     if (action && !actionsCopy.contains(action))
         emit q->triggered(action);
 }
-#endif // QT_NO_MENU
-
 
-#ifndef QT_NO_MENU
 /*! \enum QToolButton::ToolButtonPopupMode
 
     Describes how a menu should be popped up for tool buttons that has
@@ -900,7 +901,7 @@ bool QToolButton::autoRaise() const
 void QToolButton::setDefaultAction(QAction *action)
 {
     Q_D(QToolButton);
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     bool hadMenu = false;
     hadMenu = d->hasMenu();
 #endif
@@ -925,7 +926,7 @@ void QToolButton::setDefaultAction(QAction *action)
 #if QT_CONFIG(whatsthis)
     setWhatsThis(action->whatsThis());
 #endif
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     if (action->menu() && !hadMenu) {
         // new 'default' popup mode defined introduced by tool bar. We
         // should have changed QToolButton's default instead. Do that