From 415c435d605827cf4f4d9d0f723ed27c9b6baba5 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 30 Apr 2019 12:53:42 +0200
Subject: Compile when bumping the Qt version to 6.0

Change-Id: Idae1a2df144598df3921ef9a12e0e0b740fd723d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/corelib/serialization/qxmlstream.cpp | 12 +++++++++++-
 src/corelib/serialization/qxmlstream.h   |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index 0170be7602..d43d9c4e14 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -2285,12 +2285,14 @@ QXmlStreamAttribute::QXmlStreamAttribute()
     m_isDefault = false;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Destructs an attribute.
  */
 QXmlStreamAttribute::~QXmlStreamAttribute()
 {
 }
+#endif
 
 /*!  Constructs an attribute in the namespace described with \a
   namespaceUri with \a name and value \a value.
@@ -2366,6 +2368,7 @@ QXmlStreamAttribute::QXmlStreamAttribute(const QString &qualifiedName, const QSt
  */
 
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2386,7 +2389,7 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
     m_isDefault = other.m_isDefault;
     return *this;
 }
-
+#endif
 
 /*!
     \class QXmlStreamAttributes
@@ -2442,6 +2445,8 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o
 QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration()
 {
 }
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2467,6 +2472,7 @@ Destructs this notation declaration.
 QXmlStreamNotationDeclaration::~QXmlStreamNotationDeclaration()
 {
 }
+#endif
 
 /*! \fn QStringRef QXmlStreamNotationDeclaration::name() const
 
@@ -2539,6 +2545,7 @@ QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QString &pr
     m_namespaceUri = namespaceUri;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2562,6 +2569,7 @@ Destructs this namespace declaration.
 QXmlStreamNamespaceDeclaration::~QXmlStreamNamespaceDeclaration()
 {
 }
+#endif
 
 /*! \fn QStringRef QXmlStreamNamespaceDeclaration::prefix() const
 
@@ -2609,6 +2617,7 @@ QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration()
 {
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 /*!
   Creates a copy of \a other.
  */
@@ -2636,6 +2645,7 @@ QXmlStreamEntityDeclaration& QXmlStreamEntityDeclaration::operator=(const QXmlSt
 QXmlStreamEntityDeclaration::~QXmlStreamEntityDeclaration()
 {
 }
+#endif
 
 /*! \fn QXmlStreamStringRef::swap(QXmlStreamStringRef &other)
     \since 5.6
diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h
index 55dcc4e4e8..7d0aa64570 100644
--- a/src/corelib/serialization/qxmlstream.h
+++ b/src/corelib/serialization/qxmlstream.h
@@ -104,8 +104,8 @@ class Q_CORE_EXPORT QXmlStreamAttribute {
 public:
     QXmlStreamAttribute();
     QXmlStreamAttribute(const QString &qualifiedName, const QString &value);
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamAttribute(const QString &namespaceUri, const QString &name, const QString &value);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamAttribute(const QXmlStreamAttribute &);
     QXmlStreamAttribute(QXmlStreamAttribute &&other) noexcept // = default;
         : m_name(std::move(other.m_name)),
@@ -191,6 +191,7 @@ class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration {
     friend class QXmlStreamReaderPrivate;
 public:
     QXmlStreamNamespaceDeclaration();
+    QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri);
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QXmlStreamNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &);
     QXmlStreamNamespaceDeclaration(QXmlStreamNamespaceDeclaration &&other) noexcept // = default
@@ -207,7 +208,6 @@ public:
         qSwap(reserved, other.reserved);
         return *this;
     }
-    QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri);
     ~QXmlStreamNamespaceDeclaration();
     QXmlStreamNamespaceDeclaration& operator=(const QXmlStreamNamespaceDeclaration &);
 #endif // < Qt 6
-- 
cgit v1.2.3