From 3bb565bb909e0cdabc498fbe65e019dbac5e3aa5 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp>
Date: Fri, 10 Feb 2023 17:46:13 +0900
Subject: [PATCH] Fix build with -no-feature-action
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

/home/tasuku/io/qt/code/qt/qt5/qtlite/qt5/qtbase/src/plugins/platformthemes/gtk3/qgtk3interface.cpp:640:59: error: return type ‘class QIcon’ is incomplete
  640 | QIcon QGtk3Interface::fileIcon(const QFileInfo &fileInfo) const

Change-Id: I2936a3d7ae4cca200f946103b97659819775a8da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit e7e1515ead9cef1d4d502986de4dd7c66810baa6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/plugins/platformthemes/gtk3/qgtk3interface_p.h | 1 +
 src/widgets/kernel/qwidget.h                       | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/plugins/platformthemes/gtk3/qgtk3interface_p.h b/src/plugins/platformthemes/gtk3/qgtk3interface_p.h
index 0ac476eeb16..2907021869f 100644
--- a/src/plugins/platformthemes/gtk3/qgtk3interface_p.h
+++ b/src/plugins/platformthemes/gtk3/qgtk3interface_p.h
@@ -20,6 +20,7 @@
 #include <QtCore/QCache>
 #include <private/qflatmap_p.h>
 #include <QtCore/QObject>
+#include <QtGui/QIcon>
 #include <QtGui/QPalette>
 #include <QtWidgets/QWidget>
 #include <QtCore/QLoggingCategory>
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index 06ac265edef..a0a1ca53005 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -8,7 +8,9 @@
 #include <QtGui/qwindowdefs.h>
 #include <QtCore/qobject.h>
 #include <QtCore/qmargins.h>
+#if QT_CONFIG(action)
 #include <QtGui/qaction.h>
+#endif
 #include <QtGui/qpaintdevice.h>
 #include <QtGui/qpalette.h>
 #include <QtGui/qfont.h>
@@ -175,6 +177,7 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice
     Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath)
     Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
 
+#if QT_CONFIG(action)
 #if 0
     // ### TODO: make this work (requires SFINAE-friendly connect())
     template <typename...Args>
@@ -197,6 +200,8 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice
             std::negation<std::is_convertible<Args, QString>>...
         >>;
 #endif
+#endif // QT_CONFIG(action)
+
 public:
     enum RenderFlag {
         DrawWindowBackground = 0x1,