diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-26 03:00:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-06-26 03:00:44 +0200 |
commit | c480f00eedc0b7aea6906ef5788bd2adf7723c21 (patch) | |
tree | 4025af9ee1640a32afcaae6fa6aa79992eaba4ce | |
parent | 4e5633efcdc35861be88d999facaad5531cd469b (diff) | |
parent | 1b2c97d27ab420a893fbd45e864ad29986aa49e0 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I969dc5aaa41cb76b799d7ec0abf532ddfc503444
-rw-r--r-- | dist/changes-5.11.1 | 24 | ||||
-rw-r--r-- | src/oauth/qabstractoauthreplyhandler.cpp | 2 | ||||
-rw-r--r-- | src/oauth/qoauth1signature.cpp | 2 | ||||
-rw-r--r-- | tests/auto/oauth1/tst_oauth1.cpp | 2 |
4 files changed, 27 insertions, 3 deletions
diff --git a/dist/changes-5.11.1 b/dist/changes-5.11.1 new file mode 100644 index 0000000..030ea3f --- /dev/null +++ b/dist/changes-5.11.1 @@ -0,0 +1,24 @@ +Qt 5.11.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0. + +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.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +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. + +**************************************************************************** +* Qt 5.11.1 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/oauth/qabstractoauthreplyhandler.cpp b/src/oauth/qabstractoauthreplyhandler.cpp index 001ebed..b37dffc 100644 --- a/src/oauth/qabstractoauthreplyhandler.cpp +++ b/src/oauth/qabstractoauthreplyhandler.cpp @@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE \class QAbstractOAuthReplyHandler \inmodule QtNetworkAuth \ingroup oauth - \brief Handles replies to OAuth authentication requests + \brief Handles replies to OAuth authentication requests. \since 5.8 The QAbstractOAuthReplyHandler class handles the answers diff --git a/src/oauth/qoauth1signature.cpp b/src/oauth/qoauth1signature.cpp index 54d97c6..46d8874 100644 --- a/src/oauth/qoauth1signature.cpp +++ b/src/oauth/qoauth1signature.cpp @@ -47,7 +47,7 @@ Q_LOGGING_CATEGORY(loggingCategory, "qt.networkauth.oauth1.signature") \class QOAuth1Signature \inmodule QtNetworkAuth \ingroup oauth - \brief Implements OAuth 1 signature methods + \brief Implements OAuth 1 signature methods. \since 5.8 OAuth-authenticated requests can have two sets of credentials: diff --git a/tests/auto/oauth1/tst_oauth1.cpp b/tests/auto/oauth1/tst_oauth1.cpp index 7bfc628..0ca373d 100644 --- a/tests/auto/oauth1/tst_oauth1.cpp +++ b/tests/auto/oauth1/tst_oauth1.cpp @@ -218,7 +218,7 @@ void tst_OAuth1::gotError() { if (loop) loop->exit(returnCode = Failure); - disconnect(QObject::sender(), SIGNAL(finished()), this, 0); + disconnect(QObject::sender(), SIGNAL(finished()), this, nullptr); } void tst_OAuth1::clientIdentifierSignal() |