diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-16 00:49:20 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2023-01-17 03:18:28 +0900 |
| commit | ce1506355fdc9dd9df809963ee88c1f30524ceff (patch) | |
| tree | 504684c75659264d93aabb4df757882eb839decb | |
| parent | 0d596bf53d4728c2c6faf0dd0560e210faabbf01 (diff) | |
Fix build with -no-feature-cssparser
Pick-to: 6.5
Change-Id: I146ac61f92acdcd22c46ca27a1fca48c47817e3c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -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 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 <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 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 |