Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie6d44caf1d630cb029178a1af40c637f24a25ee7

1 files changed, 7 insertions, 2 deletions

diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp
index b6196d99e5..9288dc7756 100644
--- a/src/corelib/tools/qtimezone.cpp
+++ b/src/corelib/tools/qtimezone.cpp
@@ -422,13 +422,18 @@ QTimeZone &QTimeZone::operator=(const QTimeZone &other)
     return *this;
 }
 
+/*
+    \fn void QTimeZone::swap(QTimeZone &other)
+
+    Swaps this timezone with \a other. This function is very fast and
+    never fails.
+*/
+
 /*!
     \fn QTimeZone &QTimeZone::operator=(QTimeZone &&other)
 
     Move-assigns \a other to this QTimeZone instance, transferring the
     ownership of the managed pointer to this instance.
-
-    \since 5.2
 */
 
 /*!