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/kernel/qaction.h | |
| 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/kernel/qaction.h')
| -rw-r--r-- | src/widgets/kernel/qaction.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index f835c50265..808ee9065d 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -46,10 +46,9 @@ #include <QtWidgets/qwidget.h> #include <QtCore/qvariant.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(action); -#ifndef QT_NO_ACTION +QT_BEGIN_NAMESPACE class QMenu; class QActionGroup; @@ -108,8 +107,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #include <QtWidgets/qactiongroup.h> QT_END_INCLUDE_NAMESPACE -#endif // QT_NO_ACTION - QT_END_NAMESPACE #endif // QACTION_H |