summaryrefslogtreecommitdiff
path: root/src/xmlpatterns/api/qxmlname.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-06-07 12:08:14 +0200
committerLiang Qi <liang.qi@qt.io>2017-06-07 13:59:14 +0200
commitc9a4897aa09d723d22b842b1fabcc296bf3c7f91 (patch)
tree03acf263859491402be3118cc22a1959bd5a86a6 /src/xmlpatterns/api/qxmlname.cpp
parenta5984f0a63233e0e9608ce8ab66e6d2d0e6948e3 (diff)
parent7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe (diff)
downloadqtxmlpatterns-c9a4897aa09d723d22b842b1fabcc296bf3c7f91.tar.gz
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts: .qmake.conf Change-Id: Ieff26ce785aea28ebabdec2aa3364efbd59c1456
Diffstat (limited to 'src/xmlpatterns/api/qxmlname.cpp')
-rw-r--r--src/xmlpatterns/api/qxmlname.cpp14
1 files changed, 9 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
@@ -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