diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:24:55 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-08-11 10:27:08 +0200 |
commit | 4655361d2fe804d725646a2a45e0a1bc7a44c1d1 (patch) | |
tree | 7c50b662779452ec8d0ca765ee694cb29f4509c4 | |
parent | c82ade626b5f9cd2dfde2a5d7b13d7160d0a3e8c (diff) | |
parent | d8966c5f0b3e6787374b8e3138f70f672a23597b (diff) |
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
-rw-r--r-- | .qmake.conf | 4 | ||||
-rw-r--r-- | dist/changes-5.12.4 | 20 | ||||
-rw-r--r-- | dist/changes-5.13.0 | 30 | ||||
-rw-r--r-- | src/oauth/doc/qtnetworkauth.qdocconf | 1 | ||||
-rw-r--r-- | src/oauth/qabstractoauth.cpp | 2 | ||||
-rw-r--r-- | src/oauth/qoauth1.cpp | 4 | ||||
-rw-r--r-- | tests/auto/oauth1/BLACKLIST | 8 |
7 files changed, 61 insertions, 8 deletions
diff --git a/.qmake.conf b/.qmake.conf index 904af18..17ec616 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,7 @@ load(qt_build_config) - CONFIG += warning_clean +DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST + MODULE_VERSION = 6.0.0 + diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4 new file mode 100644 index 0000000..a285cd8 --- /dev/null +++ b/dist/changes-5.12.4 @@ -0,0 +1,20 @@ +Qt 5.12.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.3. + +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.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +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. + + - This release contains only minor code improvements. 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/doc/qtnetworkauth.qdocconf b/src/oauth/doc/qtnetworkauth.qdocconf index fc3c431..3ddc03b 100644 --- a/src/oauth/doc/qtnetworkauth.qdocconf +++ b/src/oauth/doc/qtnetworkauth.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtnetworkauth.qdocconf) project = QtNetworkAuth description = Qt Network Authorization Reference Documentation 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 { diff --git a/src/oauth/qoauth1.cpp b/src/oauth/qoauth1.cpp index efc7712..bc60377 100644 --- a/src/oauth/qoauth1.cpp +++ b/src/oauth/qoauth1.cpp @@ -131,7 +131,7 @@ void QOAuth1Private::appendCommonHeaders(QVariantMap *headers) headers->insert(Key::oauthNonce, QOAuth1::nonce()); headers->insert(Key::oauthConsumerKey, clientIdentifier); - headers->insert(Key::oauthTimestamp, QString::number(currentDateTime.toTime_t())); + headers->insert(Key::oauthTimestamp, QString::number(currentDateTime.toSecsSinceEpoch())); headers->insert(Key::oauthVersion, oauthVersion); headers->insert(Key::oauthSignatureMethod, signatureMethodString().toUtf8()); } @@ -288,7 +288,7 @@ QVariantMap QOAuth1Private::createOAuthBaseParams() const oauthParams.insert(Key::oauthToken, token); oauthParams.insert(Key::oauthSignatureMethod, signatureMethodString()); oauthParams.insert(Key::oauthNonce, QOAuth1::nonce()); - oauthParams.insert(Key::oauthTimestamp, QString::number(currentDateTime.toTime_t())); + oauthParams.insert(Key::oauthTimestamp, QString::number(currentDateTime.toSecsSinceEpoch())); return oauthParams; } diff --git a/tests/auto/oauth1/BLACKLIST b/tests/auto/oauth1/BLACKLIST index 3f74a03..e5fccf2 100644 --- a/tests/auto/oauth1/BLACKLIST +++ b/tests/auto/oauth1/BLACKLIST @@ -12,8 +12,8 @@ windows windows [grant] -* +windows +linux [authenticatedCalls] -* -[prepareRequestCalls] -* +windows +linux amd |