summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2020-02-19 13:16:29 +0100
committerAndré Klitzing <aklitzing@gmail.com>2020-02-19 15:21:40 +0100
commitfc3226e7909812092e9e1acdd45140427b3a4cf0 (patch)
tree5c9a82466650446ee20faad694ac758b118c9de8
parentb1b37a36cbbea564def3475bfefd20e8ad54ed1c (diff)
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 <sona.kurazyan@qt.io>
-rw-r--r--src/xml/dom/qdom.cpp5
-rw-r--r--src/xml/dom/qdomhelpers.cpp6
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 <qplatformdefs.h>
#include <qdom.h>
-#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 <qatomic.h>
#include <qbuffer.h>
#include <qiodevice.h>
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 <QtXml/qtxmlglobal.h>
+
+#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