summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:01:15 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-06-22 03:01:15 +0200
commit5f9379f03fe1ba2303031c6e0dba4ae0de56c3e8 (patch)
treedde21efbd153ef2c422f100f1e784cf2fa884013
parent8bc6feb36a471006cfa4b62189edc3d7fd67bf78 (diff)
parent3d4935594a5ba35a83e6098eaa8eac52aba22ca2 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--dist/changes-5.13.030
-rw-r--r--src/oauth/qabstractoauth.cpp2
2 files changed, 31 insertions, 1 deletions
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 0000000..d705d25
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,30 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+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.
+
+****************************************************************************
+* QAbstractOAuth *
+****************************************************************************
+
+ - Added prepareRequest and sendCustomRequest methods to authenticate any
+ custom request, including custom verbs and bodies.
+
+****************************************************************************
+* QOAuth1Signature *
+****************************************************************************
+
+ - Added customMethodString and setCustomMethodString methods to support
+ signing requests with custom methods.
diff --git a/src/oauth/qabstractoauth.cpp b/src/oauth/qabstractoauth.cpp
index a7a6c29..46985d6 100644
--- a/src/oauth/qabstractoauth.cpp
+++ b/src/oauth/qabstractoauth.cpp
@@ -529,7 +529,7 @@ void QAbstractOAuth::prepareRequest(QNetworkRequest *request,
/*!
Returns the current parameter-modification function.
- \sa QAbstractOAuth::ModifyParametersFunction, setModifyParametersFunction(), Stage
+ \sa setModifyParametersFunction(), Stage
*/
QAbstractOAuth::ModifyParametersFunction QAbstractOAuth::modifyParametersFunction() const
{