2 files changed, 8 insertions, 4 deletions
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index d7285fc289..6bb9bfbe9c 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -201,10 +201,10 @@ class Q_XML_EXPORT QXmlReader
 {
 public:
     virtual ~QXmlReader() {}
-    virtual bool feature(const QString& name, bool *ok = 0) const = 0;
+    virtual bool feature(const QString& name, bool *ok = Q_NULLPTR) const = 0;
     virtual void setFeature(const QString& name, bool value) = 0;
     virtual bool hasFeature(const QString& name) const = 0;
-    virtual void* property(const QString& name, bool *ok = 0) const = 0;
+    virtual void* property(const QString& name, bool *ok = Q_NULLPTR) const = 0;
     virtual void setProperty(const QString& name, void* value) = 0;
     virtual bool hasProperty(const QString& name) const = 0;
     virtual void setEntityResolver(QXmlEntityResolver* handler) = 0;
@@ -229,11 +229,11 @@ public:
     QXmlSimpleReader();
     virtual ~QXmlSimpleReader();
 
-    bool feature(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE;
+    bool feature(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE;
     void setFeature(const QString& name, bool value) Q_DECL_OVERRIDE;
     bool hasFeature(const QString& name) const Q_DECL_OVERRIDE;
 
-    void* property(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE;
+    void* property(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE;
     void setProperty(const QString& name, void* value) Q_DECL_OVERRIDE;
     bool hasProperty(const QString& name) const Q_DECL_OVERRIDE;
 
diff --git a/src/xml/sax/qxml_p.h b/src/xml/sax/qxml_p.h
index 7712b5760c..013c2618a3 100644
--- a/src/xml/sax/qxml_p.h
+++ b/src/xml/sax/qxml_p.h
@@ -104,6 +104,7 @@ private:
         QString value;
         int index;
     };
+    friend class QTypeInfo<XmlRef>;
     QStack<XmlRef> xmlRefStack;
 
     // used for standalone declaration
@@ -166,6 +167,7 @@ private:
         ParseFunction function;
         int state;
     };
+    friend class QTypeInfo<ParseState>;
     QStack<ParseState> *parseStack;
 
     // used in parseProlog()
@@ -294,6 +296,8 @@ private:
     friend class QXmlSimpleReaderLocator;
     friend class QDomHandler;
 };
+Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::ParseState, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(QXmlSimpleReaderPrivate::XmlRef, Q_MOVABLE_TYPE);
 
 QT_END_NAMESPACE