From ce1506355fdc9dd9df809963ee88c1f30524ceff Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Mon, 16 Jan 2023 00:49:20 +0900 Subject: [PATCH] Fix build with -no-feature-cssparser Pick-to: 6.5 Change-Id: I146ac61f92acdcd22c46ca27a1fca48c47817e3c Reviewed-by: Volker Hilsheimer --- src/gui/text/qtextdocument_p.h | 2 ++ src/gui/text/qtextdocumentlayout.cpp | 2 ++ src/gui/text/qtexthtmlparser_p.h | 2 ++ .../platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h | 1 - src/widgets/styles/qstylesheetstyle_default.cpp | 4 +++- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index d77ee7420b..84a79691e9 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -29,7 +29,9 @@ #include "QtCore/qurl.h" #include "QtCore/qvariant.h" +#if QT_CONFIG(cssparser) #include "private/qcssparser_p.h" +#endif #include "private/qfragmentmap_p.h" #include "private/qobject_p.h" #include "private/qtextformat_p.h" diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 764f9ce0cb..56ce6861f1 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -7,7 +7,9 @@ #include "qtexttable.h" #include "qtextlist.h" #include "qtextengine_p.h" +#if QT_CONFIG(cssparser) #include "private/qcssutil_p.h" +#endif #include "private/qguiapplication_p.h" #include "qabstracttextdocumentlayout_p.h" diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h index b26862da7f..0085c01e87 100644 --- a/src/gui/text/qtexthtmlparser_p.h +++ b/src/gui/text/qtexthtmlparser_p.h @@ -26,7 +26,9 @@ #include "private/qtextformat_p.h" #include "private/qtextdocument_p.h" +#if QT_CONFIG(cssparser) #include "private/qcssparser_p.h" +#endif #ifndef QT_NO_TEXTHTMLPARSER diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h index 17428f778f..d12501bd90 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include diff --git a/src/widgets/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp index b299c9e022..b665ab17cf 100644 --- a/src/widgets/styles/qstylesheetstyle_default.cpp +++ b/src/widgets/styles/qstylesheetstyle_default.cpp @@ -11,8 +11,10 @@ avoid parsing overhead. */ -#include "private/qcssparser_p.h" #include "qstylesheetstyle_p.h" +#if QT_CONFIG(cssparser) +#include "private/qcssparser_p.h" +#endif #ifndef QT_NO_STYLE_STYLESHEET