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/gui | |
| 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/gui')
| -rw-r--r-- | src/gui/configure.json | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qevent.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 90d0c8c134..5b8063d720 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1638,8 +1638,8 @@ "output": [ "publicFeature", "feature" ] }, "action": { - "label": "QAction", - "purpose": "Provides widget actions.", + "label": "Q(Gui)Action(Group)", + "purpose": "Provides abstract user interface actions.", "section": "Kernel", "output": [ "publicFeature", "feature" ] }, diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 85d22319ae..6f3215652b 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -753,7 +753,7 @@ private: }; #endif -#ifndef QT_NO_ACTION +#if QT_CONFIG(action) class Q_GUI_EXPORT QActionEvent : public QEvent { QGuiAction *act, *bef; @@ -764,7 +764,7 @@ public: inline QGuiAction *action() const { return act; } inline QGuiAction *before() const { return bef; } }; -#endif +#endif // QT_CONFIG(action) class Q_GUI_EXPORT QFileOpenEvent : public QEvent { |