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/kernel/qapplication.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/kernel/qapplication.cpp')
| -rw-r--r-- | src/widgets/kernel/qapplication.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index fe7a9c2500..01bd1c5033 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -73,7 +73,7 @@ #include <QtGui/private/qwindow_p.h> #include <QtGui/qtouchdevice.h> #include <qpa/qplatformtheme.h> -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) #include <QtWidgets/QWhatsThis> #endif @@ -1999,7 +1999,7 @@ bool QApplication::event(QEvent *e) } else if (te->timerId() == d->toolTipFallAsleep.timerId()) { d->toolTipFallAsleep.stop(); } -#ifndef QT_NO_WHATSTHIS +#if QT_CONFIG(whatsthis) } else if (e->type() == QEvent::EnterWhatsThisMode) { QWhatsThis::enterWhatsThisMode(); return true; @@ -3381,7 +3381,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) break; #endif // QT_CONFIG(tabletevent) -#if !defined(QT_NO_TOOLTIP) || !defined(QT_NO_WHATSTHIS) +#if !defined(QT_NO_TOOLTIP) || QT_CONFIG(whatsthis) case QEvent::ToolTip: case QEvent::WhatsThis: case QEvent::QueryWhatsThis: @@ -3406,7 +3406,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } break; #endif -#if !defined(QT_NO_STATUSTIP) || !defined(QT_NO_WHATSTHIS) +#if !defined(QT_NO_STATUSTIP) || QT_CONFIG(whatsthis) case QEvent::StatusTip: case QEvent::WhatsThisClicked: { |