diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-02-10 17:46:13 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-02-12 07:23:47 +0900 |
| commit | e7e1515ead9cef1d4d502986de4dd7c66810baa6 (patch) | |
| tree | 2546e2b0dbd64878f29df6bf1bf23b3f8f07359b | |
| parent | 0835537c3c3a8b7991b7a6e4a877a13f165a66e7 (diff) | |
Fix build with -no-feature-action
/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
Pick-to: 6.5
Change-Id: I2936a3d7ae4cca200f946103b97659819775a8da
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/plugins/platformthemes/gtk3/qgtk3interface_p.h | 1 | ||||
| -rw-r--r-- | src/widgets/kernel/qwidget.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platformthemes/gtk3/qgtk3interface_p.h b/src/plugins/platformthemes/gtk3/qgtk3interface_p.h index 9700940e40..2765473eda 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3interface_p.h +++ b/src/plugins/platformthemes/gtk3/qgtk3interface_p.h @@ -19,6 +19,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 06ac265ede..a0a1ca5300 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, |