diff options
| author | Tasuku Suzuki <[email protected]> | 2023-01-16 00:49:20 +0900 |
|---|---|---|
| committer | Qt Cherry-pick Bot <[email protected]> | 2023-01-16 19:04:05 +0000 |
| commit | 7c43c134557deda90d604ff789bcd17b94ef5b39 (patch) | |
| tree | 30db565f089a82cb4cc6138740d2cb5d468dae5a | |
| parent | be95bb0358af9bd2011c03d34c12d958f236e54b (diff) | |
Fix build with -no-feature-cssparser
Change-Id: I146ac61f92acdcd22c46ca27a1fca48c47817e3c
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit ce1506355fdc9dd9df809963ee88c1f30524ceff)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
| -rw-r--r-- | src/gui/text/qtextdocument_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextdocumentlayout.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qtexthtmlparser_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglinclude.h | 1 | ||||
| -rw-r--r-- | 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 d77ee7420b2..84a79691e97 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 b86b6ca923b..edf7ba93214 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 b26862da7f3..0085c01e876 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 17428f778f0..d12501bd90d 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 <QtGui/QPalette> #include <QtCore/QTextStream> #include <QtGui/private/qmath_p.h> -#include <QtGui/private/qcssparser_p.h> #include <QtGui/private/qtextengine_p.h> #include <QtGui/private/qt_egl_p.h> diff --git a/src/widgets/styles/qstylesheetstyle_default.cpp b/src/widgets/styles/qstylesheetstyle_default.cpp index b299c9e0224..b665ab17cfc 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 |