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>

1 files changed, 5 insertions, 7 deletions

diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp
index f6e7337878..462691ffb3 100644
--- a/src/widgets/widgets/qlineedit_p.cpp
+++ b/src/widgets/widgets/qlineedit_p.cpp
@@ -47,7 +47,9 @@
 #if QT_CONFIG(draganddrop)
 #include "qdrag.h"
 #endif
-#include "qwidgetaction.h"
+#if QT_CONFIG(action)
+#  include "qwidgetaction.h"
+#endif
 #include "qclipboard.h"
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
@@ -545,6 +547,7 @@ void QLineEditPrivate::positionSideWidgets()
     }
 }
 
+#if QT_CONFIG(action)
 QLineEditPrivate::SideWidgetLocation QLineEditPrivate::findSideWidget(const QGuiAction *a) const
 {
     int i = 0;
@@ -574,12 +577,10 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
     QWidget *w = 0;
     // Store flags about QWidgetAction here since removeAction() may be called from ~QAction,
     // in which a qobject_cast<> no longer works.
-#if QT_CONFIG(action)
     if (QWidgetAction *widgetAction = qobject_cast<QWidgetAction *>(newAction)) {
         if ((w = widgetAction->requestWidget(q)))
             flags |= SideWidgetCreatedByWidgetAction;
     }
-#endif
     if (!w) {
 #if QT_CONFIG(toolbutton)
         QLineEditIconButton *toolButton = new QLineEditIconButton(q);
@@ -636,7 +637,6 @@ QWidget *QLineEditPrivate::addAction(QAction *newAction, QAction *before, QLineE
 
 void QLineEditPrivate::removeAction(QGuiAction *action)
 {
-#if QT_CONFIG(action)
     Q_Q(QLineEdit);
     const auto location = findSideWidget(action);
     if (!location.isValid())
@@ -652,10 +652,8 @@ void QLineEditPrivate::removeAction(QGuiAction *action)
      if (!hasSideWidgets()) // Last widget, remove connection
          QObject::disconnect(q, SIGNAL(textChanged(QString)), q, SLOT(_q_textChanged(QString)));
      q->update();
-#else
-    Q_UNUSED(action);
-#endif // QT_CONFIG(action)
 }
+#endif // QT_CONFIG(action)
 
 static int effectiveTextMargin(int defaultMargin, const QLineEditPrivate::SideWidgetEntryList &widgets,
                                const QLineEditPrivate::SideWidgetParameters &parameters)