diff options
| author | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2018-05-25 15:40:36 +0200 |
|---|---|---|
| committer | Valentin Fokin <fokinv@inf.u-szeged.hu> | 2018-07-12 08:57:09 +0000 |
| commit | 21291d78c528b798252a046db4f17872132259f4 (patch) | |
| tree | e8884b64b47f605cd32049a9eff1351422ff5e13 /src/widgets/kernel/qwhatsthis.cpp | |
| parent | 9146432dc66d41f22548bbb425b61458d241d28e (diff) | |
Fix build with '-no-feature-action' configuration
Task-number: QTBUG-68353
Change-Id: Ia949e4a72a363df5fba86504e5f7e3ce8a3ad347
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/kernel/qwhatsthis.cpp')
| -rw-r--r-- | src/widgets/kernel/qwhatsthis.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 96d0cf61c4..1fa83d3238 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -48,7 +48,9 @@ #include "qscreen.h" #include "qpainter.h" #include "qtimer.h" +#if QT_CONFIG(action) #include "qaction.h" +#endif // QT_CONFIG(action) #include "qcursor.h" #include "qbitmap.h" #include "qtextdocument.h" @@ -366,7 +368,9 @@ class QWhatsThisPrivate : public QObject ~QWhatsThisPrivate(); static QWhatsThisPrivate *instance; bool eventFilter(QObject *, QEvent *) override; +#if QT_CONFIG(action) QPointer<QAction> action; +#endif // QT_CONFIG(action) static void say(QWidget *, const QString &, int x = 0, int y = 0); static void notifyToplevels(QEvent *e); bool leaveOnMouseRelease; @@ -408,8 +412,10 @@ QWhatsThisPrivate::QWhatsThisPrivate() QWhatsThisPrivate::~QWhatsThisPrivate() { +#if QT_CONFIG(action) if (action) action->setChecked(false); +#endif // QT_CONFIG(action) #ifndef QT_NO_CURSOR QApplication::restoreOverrideCursor(); #endif @@ -485,6 +491,7 @@ bool QWhatsThisPrivate::eventFilter(QObject *o, QEvent *e) return true; } +#if QT_CONFIG(action) class QWhatsThisAction: public QAction { Q_OBJECT @@ -516,6 +523,7 @@ void QWhatsThisAction::actionTriggered() QWhatsThisPrivate::instance->action = this; } } +#endif // QT_CONFIG(action) /*! This function switches the user interface into "What's This?" @@ -672,10 +680,12 @@ void QWhatsThis::hideText() The returned QAction provides a convenient way to let users enter "What's This?" mode. */ +#if QT_CONFIG(action) QAction *QWhatsThis::createAction(QObject *parent) { return new QWhatsThisAction(parent); } +#endif // QT_CONFIG(action) QT_END_NAMESPACE |