diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-26 01:00:25 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-26 18:39:21 +0100 |
| commit | 75c0ffaf6d2b92cdf26092e01acdd5af4afeac97 (patch) | |
| tree | bb9e85c21248790ec99b3665928872e39b14db64 /src/xml | |
| parent | 4753d69d8934258de7fb64550e50a5cbb9b5603f (diff) | |
| parent | 462c2745a5168a5b57381d05779b5d16aebe018e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/network/bearermonitor/CMakeLists.txt
examples/network/CMakeLists.txt
src/corelib/tools/qlinkedlist.h
src/sql/kernel/qsqldriver_p.h
src/sql/kernel/qsqlresult_p.h
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
tests/auto/tools/moc/allmocs_baseline_in.json
Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
Diffstat (limited to 'src/xml')
| -rw-r--r-- | src/xml/dom/qdom.cpp | 5 | ||||
| -rw-r--r-- | 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 1ac13b380a..39cf0c2653 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 |