From 5367f76e1755aecf9527660d1c00e4e6d29d7c78 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 18 Oct 2019 15:03:08 +0200
Subject: 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>
---
 src/widgets/kernel/qactiongroup.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/widgets/kernel/qactiongroup.h')

diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h
index 6ec2fc09ef..0a6a85f093 100644
--- a/src/widgets/kernel/qactiongroup.h
+++ b/src/widgets/kernel/qactiongroup.h
@@ -44,10 +44,9 @@
 #include <QtGui/qguiactiongroup.h>
 #include <QtWidgets/qaction.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(action);
 
-#ifndef QT_NO_ACTION
+QT_BEGIN_NAMESPACE
 
 class QActionGroupPrivate;
 
@@ -76,8 +75,6 @@ private:
     Q_DISABLE_COPY(QActionGroup)
 };
 
-#endif // QT_NO_ACTION
-
 QT_END_NAMESPACE
 
 #endif // QACTIONGROUP_H
-- 
cgit v1.2.3