Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: Ieff26ce785aea28ebabdec2aa3364efbd59c1456

5 files changed, 30 insertions, 8 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 0000000..e33a407
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,16 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
diff --git a/src/xmlpatterns/api/qxmlname.cpp b/src/xmlpatterns/api/qxmlname.cpp
index 241aa5e..83b72cf 100644
--- a/src/xmlpatterns/api/qxmlname.cpp
+++ b/src/xmlpatterns/api/qxmlname.cpp
@@ -402,13 +402,17 @@ QString QXmlName::toClarkName(const QXmlNamePool &namePool) const
 }
 
 /*!
+    Constructs a copy of \a other.
+
+    \sa operator=()
+    \since 5.9
+*/
+QXmlName::QXmlName(const QXmlName &) = default; // ### Qt 6: remove
+
+/*!
   Assigns \a other to \e this and returns \e this.
  */
-QXmlName &QXmlName::operator=(const QXmlName &other)
-{
-    m_qNameCode = other.m_qNameCode;
-    return *this;
-}
+QXmlName &QXmlName::operator=(const QXmlName &) = default; // ### Qt 6: remove
 
 /*!
  Returns true if \a candidate is an \c NCName. An \c NCName
diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h
index 7dad306..0e30b4c 100644
--- a/src/xmlpatterns/api/qxmlname.h
+++ b/src/xmlpatterns/api/qxmlname.h
@@ -92,6 +92,7 @@ public:
     QString toClarkName(const QXmlNamePool &query) const;
     bool operator==(const QXmlName &other) const;
     bool operator!=(const QXmlName &other) const;
+    QXmlName(const QXmlName &other);
     QXmlName &operator=(const QXmlName &other);
     bool isNull() const;
     static bool isNCName(const QString &candidate);
diff --git a/src/xmlpatterns/configure.json b/src/xmlpatterns/configure.json
index 851ebf8..a37909f 100644
--- a/src/xmlpatterns/configure.json
+++ b/src/xmlpatterns/configure.json
@@ -4,8 +4,9 @@
     "features": {
         "xml-schema": {
             "label": "XML schema support",
-            "purpose": "Support for XML schema validation",
-            "output": [ "privateFeature" ]
+            "purpose": "Provides XML schema validation.",
+            "section": "QtXmlPatterns",
+            "output": [ "publicFeature" ]
         }
     },
 
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
index 294e5fc..8db61b9 100644
--- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -144,7 +144,7 @@ void tst_XmlPatterns::xquerySupport()
     if(!cwd.isEmpty())
         process.setWorkingDirectory(inputFile(cwd));
 
-    QProcessEnvironment env(process.processEnvironment());
+    QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
     env.insert("QT_LOGGING_RULES", "qt.network.ssl=false");
     process.setProcessEnvironment(env);