From 00f6258fb64e6ebf0144d8a6e8fb1515a531b0e4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 10 May 2020 11:55:17 +0200 Subject: [PATCH] Adapt qxmlstream.g to older changes to qxmlstream_p.h Change-Id: I35c0700ed29d756949b95c3a26fdf9f087b5ef1c Reviewed-by: Lars Knoll --- src/corelib/serialization/qxmlstream.g | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index 503b0e547d..adc09a5ebe 100644 --- a/src/corelib/serialization/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g @@ -156,7 +156,7 @@ template class QXmlStreamSimpleStack { T *data; int tos, cap; public: - inline QXmlStreamSimpleStack():data(0), tos(-1), cap(0){} + inline QXmlStreamSimpleStack():data(nullptr), tos(-1), cap(0){} inline ~QXmlStreamSimpleStack(){ if (data) free(data); } inline void reserve(int extraCapacity) { @@ -511,7 +511,7 @@ public: QString resolveUndeclaredEntity(const QString &name); void parseEntity(const QString &value); - QXmlStreamReaderPrivate *entityParser; + std::unique_ptr entityParser; bool scanAfterLangleBang(); bool scanPublicOrSystem();