diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-21 06:55:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-21 06:55:09 +0000 |
| commit | e5114e10dcb1fc535b4a33a3008448baf4ec7cbf (patch) | |
| tree | 7ec9eaac618a4de514f452b0e7aff58510ce7c62 /src/widgets/accessible/qaccessiblewidget.cpp | |
| parent | 34aa7a18af5d355380c662bb1a10b3f0d7b7ed3e (diff) | |
| parent | 01bc69f99f189b03d0b9cad77cc300798937cad1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/widgets/accessible/qaccessiblewidget.cpp')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index e3dd7383b2..c96d213e7b 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -60,7 +60,9 @@ #include <QRubberBand> #endif #include <QFocusFrame> +#if QT_CONFIG(menu) #include <QMenu> +#endif #include <QtWidgets/private/qwidget_p.h> QT_BEGIN_NAMESPACE @@ -72,7 +74,7 @@ static QList<QWidget*> childWidgets(const QWidget *widget) QWidget *w = qobject_cast<QWidget *>(o); if (w && !w->isWindow() && !qobject_cast<QFocusFrame*>(w) -#if !defined(QT_NO_MENU) +#if QT_CONFIG(menu) && !qobject_cast<QMenu*>(w) #endif && w->objectName() != QLatin1String("qt_rubberband") |