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

 Conflicts:
	src/corelib/tools/qcollator_win.cpp

Change-Id: I6d806d7c58b2057ebde3ad915bb5551f34b700e5

1 files changed, 4 insertions, 4 deletions

diff --git a/src/network/ssl/qocspresponse.cpp b/src/network/ssl/qocspresponse.cpp
index 1f2de44859..d564e817ca 100644
--- a/src/network/ssl/qocspresponse.cpp
+++ b/src/network/ssl/qocspresponse.cpp
@@ -124,14 +124,14 @@ QOcspResponse::QOcspResponse()
 /*!
     \since 5.13
 
-    Creates a new response, the copy of \a other.
+    Copy-constructs a QOcspResponse instance.
 */
 QOcspResponse::QOcspResponse(const QOcspResponse &) = default;
 
 /*!
     \since 5.13
 
-    Move-constructs a QOcspResponse instance from \a other.
+    Move-constructs a QOcspResponse instance.
 */
 QOcspResponse::QOcspResponse(QOcspResponse &&) Q_DECL_NOTHROW = default;
 
@@ -145,14 +145,14 @@ QOcspResponse::~QOcspResponse() = default;
 /*!
     \since 5.13
 
-    Assigns \a other to the response and returns a reference to this response.
+    Copy-assigns and returns a reference to this response.
 */
 QOcspResponse &QOcspResponse::operator=(const QOcspResponse &) = default;
 
 /*!
     \since 5.13
 
-    Move-assigns \a other to this QOcspResponse instance.
+    Move-assigns to this QOcspResponse instance.
 */
 QOcspResponse &QOcspResponse::operator=(QOcspResponse &&) Q_DECL_NOTHROW = default;