From da19c9882295a8f3216284935c05ad4b89c445bd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 19 Apr 2017 16:03:33 +0200 Subject: QXmlName: Add copy constructor and use default for copy/assignment Fix Clang warning: 95:15: warning: definition of implicit copy constructor for 'QXmlName' is deprecated because it has a user-declared copy assignment operator qmetatype.h:1684:83: note: in instantiation of member function 'QtMetaTypePrivate::QMetaTypeFunctionHelper::Construct' requested here qmetatype.h:1712:12: note: in instantiation of function template specialization 'qRegisterNormalizedMetaType' requested here 134:1: note: in instantiation of function template specialization 'qRegisterMetaType' requested here qmetatype.h:1848:34: note: expanded from macro 'Q_DECLARE_METATYPE' qmetatype.h:1860:35: note: expanded from macro 'Q_DECLARE_METATYPE_IMPL' qmetatype.h:765:32: note: implicit copy constructor for 'QXmlName' first required here Change-Id: I5e194201278d2a5d613eac9dc9cd7b36679697b3 Reviewed-by: Marc Mutz --- src/xmlpatterns/api/qxmlname.cpp | 14 +++++++++----- src/xmlpatterns/api/qxmlname.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) 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 @@ -401,14 +401,18 @@ QString QXmlName::toClarkName(const QXmlNamePool &namePool) const return namePool.d->toClarkName(*this); } +/*! + 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); -- cgit v1.2.1 From b99924c941a948793f071ab2bc829c41b660a395 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Wed, 26 Apr 2017 10:40:24 +0300 Subject: Pass system environment to processes invoked from tst_xmlpatterns This fixes test run with QEMU, which needs QEMU environmental variables passed also to the process invoked from it. Task-number: QTBUG-60266 Change-Id: Icc77f36aa6107043e0845680c2fd4fbf33a7e4e2 Reviewed-by: Simon Hausmann Reviewed-by: Timur Pocheptsov --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.1 From 84ee5b9b2636a5d33852fc0fb114968c5fae1d1c Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 2 May 2017 18:10:47 +0200 Subject: Make features.xml-schema publicFeature QXmlSchema[Validator] are in public Qt API Change-Id: I6103f1e7d88bf878776556793f78607e741dfee1 Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- src/xmlpatterns/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/configure.json b/src/xmlpatterns/configure.json index 851ebf8..3f58995 100644 --- a/src/xmlpatterns/configure.json +++ b/src/xmlpatterns/configure.json @@ -5,7 +5,7 @@ "xml-schema": { "label": "XML schema support", "purpose": "Support for XML schema validation", - "output": [ "privateFeature" ] + "output": [ "publicFeature" ] } }, -- cgit v1.2.1 From c1c3af0ae456247c9bcd30161d51a94c9b38dc52 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 5 May 2017 10:08:19 +0300 Subject: Add changes file for 5.9.0 Listing important changes and bug-fixes. Change-Id: I264a2e6797a89b61bc215e19444e9bb8d7f881d9 Reviewed-by: Friedemann Kleint --- dist/changes-5.9.0 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 dist/changes-5.9.0 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. -- cgit v1.2.1 From 34182ce99b1c67036ed86151d069022cae3bbd3e Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Sat, 6 May 2017 22:33:00 +0200 Subject: Add section and update purpose of features.xml-schema Change-Id: Ica28866669aea9e1fb4d0d586bbcce87dd6afa95 Reviewed-by: Oswald Buddenhagen --- src/xmlpatterns/configure.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xmlpatterns/configure.json b/src/xmlpatterns/configure.json index 3f58995..a37909f 100644 --- a/src/xmlpatterns/configure.json +++ b/src/xmlpatterns/configure.json @@ -4,7 +4,8 @@ "features": { "xml-schema": { "label": "XML schema support", - "purpose": "Support for XML schema validation", + "purpose": "Provides XML schema validation.", + "section": "QtXmlPatterns", "output": [ "publicFeature" ] } }, -- cgit v1.2.1 From 78b72b574520e2706ff38521f6c78e360cce7c41 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 10 May 2017 19:07:13 +0200 Subject: Bump version Change-Id: If9caa80c2a21dc3d0cca2522ae9de9c401c52fd2 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 74c762b..d860bee 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.9.0 +MODULE_VERSION = 5.9.1 -- cgit v1.2.1