diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-09-03 18:45:41 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-09-19 10:57:12 +0000 |
commit | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (patch) | |
tree | 6af5893454cca281d74cfba01109aa0c11135f04 /src/widgets/accessible/qaccessiblewidget.cpp | |
parent | 9833e682174c968efb62e6cd473787e3b0b8fb05 (diff) |
Convert features.menu to QT_[REQUIRE_]CONFIG
Change-Id: I031356411294b259ebd2b22c53159c93fd92af6e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
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") |