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 <typename T> 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<QXmlStreamReaderPrivate> entityParser;
 
     bool scanAfterLangleBang();
     bool scanPublicOrSystem();