From fc3226e7909812092e9e1acdd45140427b3a4cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= Date: Wed, 19 Feb 2020 13:16:29 +0100 Subject: [PATCH] Fix broken -no-feature-dom 44a26a0a79ed07b829d55979eaed6f06346ca450 did a clean up and moved the new private header outside of QT_NO_DOM. Fixes: QTBUG-82175 Change-Id: Iafe9c53b78037bdac8420911f6847d29672c68de Reviewed-by: Sona Kurazyan --- src/xml/dom/qdom.cpp | 5 +++-- src/xml/dom/qdomhelpers.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 26c1a2122b..f63bf47e3e 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -39,12 +39,13 @@ #include #include -#include "qdom_p.h" -#include "qdomhelpers_p.h" #include "private/qxmlutils_p.h" #ifndef QT_NO_DOM +#include "qdom_p.h" +#include "qdomhelpers_p.h" + #include #include #include diff --git a/src/xml/dom/qdomhelpers.cpp b/src/xml/dom/qdomhelpers.cpp index 10e37f7c0f..63c2db929a 100644 --- a/src/xml/dom/qdomhelpers.cpp +++ b/src/xml/dom/qdomhelpers.cpp @@ -37,6 +37,10 @@ ** ****************************************************************************/ +#include + +#ifndef QT_NO_DOM + #include "qdomhelpers_p.h" #include "qdom_p.h" #include "qxmlstream.h" @@ -661,3 +665,5 @@ bool QDomParser::parseMarkupDecl() } QT_END_NAMESPACE + +#endif // QT_NO_DOM