diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-18 15:03:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-01 20:09:28 +0100 |
| commit | 5367f76e1755aecf9527660d1c00e4e6d29d7c78 (patch) | |
| tree | 5dd6f6aa554ec777dc7d96f521b8a3fb3d67beba /src/widgets/util | |
| parent | c92cb78b6d7c6590c79ec0e2df4dd577617bd3e1 (diff) | |
QAction: Properly port to the new configure system
Use QT_REQUIRE_CONFIG in the headers of classes to be disabled.
Add headers/source files in the .pro file depending on the configure
feature in libraries and tests.
Add the necessary exclusions and use QT_CONFIG.
Only the widgets/kernel tests were made to compile since also
the buttons depend on the action feature and it would become too
involved.
Task-number: QTBUG-69478
Change-Id: Id5bf88bc108f2bbb14dce8625bfdcb7eb0deb8e3
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/util')
| -rw-r--r-- | src/widgets/util/qundostack.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/util/qundostack_p.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp index 8788c42252..dbe01e4ad8 100644 --- a/src/widgets/util/qundostack.cpp +++ b/src/widgets/util/qundostack.cpp @@ -443,7 +443,7 @@ const QUndoCommand *QUndoCommand::child(int index) const \sa QUndoCommand, QUndoView */ -#ifndef QT_NO_ACTION +#if QT_CONFIG(action) QUndoAction::QUndoAction(const QString &prefix, QObject *parent) : QAction(parent) @@ -473,7 +473,7 @@ void QUndoAction::setTextFormat(const QString &textFormat, const QString &defaul m_defaultText = defaultText; } -#endif // QT_NO_ACTION +#endif // QT_CONFIG(action) /*! \internal Sets the current index to \a idx, emitting appropriate signals. If \a clean is true, diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index 05c9e0d27e..c44cdd6603 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -44,7 +44,9 @@ #include <private/qobject_p.h> #include <QtCore/qlist.h> #include <QtCore/qstring.h> -#include <QtWidgets/qaction.h> +#if QT_CONFIG(action) +# include <QtWidgets/qaction.h> +#endif #include "qundostack.h" |