diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-06-10 07:09:50 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-06-29 02:22:34 +0000 |
commit | 150ee7f4f1fb6280aa7fd8c15b6d72d806c0f68c (patch) | |
tree | d5d0d4bf551358aa8d8d1ea6462e0605ccc6bfaf /src/widgets/widgets/qmenubar.cpp | |
parent | fa7626713b3a943609453459190e16c49d61dfd3 (diff) |
Convert features.whatsthis to QT_[REQUIRE_]CONFIG
Move feature definition to gui/configure.json
Change-Id: I00b35c0e259d0a695d84a9bf6803eba74d41465a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenubar.cpp')
-rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index c16b2a5ac1..8ec2a3ed94 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -52,7 +52,9 @@ #include <qmainwindow.h> #include <qtoolbar.h> #include <qtoolbutton.h> +#if QT_CONFIG(whatsthis) #include <qwhatsthis.h> +#endif #include <qpa/qplatformtheme.h> #include "private/qguiapplication_p.h" #include "qpa/qplatformintegration.h" @@ -1013,7 +1015,7 @@ void QMenuBar::mousePressEvent(QMouseEvent *e) QAction *action = d->actionAt(e->pos()); if (!action || !d->isVisible(action) || !action->isEnabled()) { d->setCurrentAction(0); -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) if (QWhatsThis::inWhatsThisMode()) QWhatsThis::showText(e->globalPos(), d->whatsThis, this); #endif @@ -1432,7 +1434,7 @@ bool QMenuBar::event(QEvent *e) } break; #endif -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) case QEvent::QueryWhatsThis: e->setAccepted(d->whatsThis.size()); if (QAction *action = d->actionAt(static_cast<QHelpEvent*>(e)->pos())) { |