Hello community,
here is the log from the commit of package libqt5-qtnetworkauth for
openSUSE:Factory checked in at 2017-10-24 22:21:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtnetworkauth (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtnetworkauth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtnetworkauth"
Tue Oct 24 22:21:59 2017 rev:3 rq:533804 version:5.9.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/libqt5-qtnetworkauth/libqt5-qtnetworkauth.changes
2017-09-14 21:15:19.829605407 +0200
+++
/work/SRC/openSUSE:Factory/.libqt5-qtnetworkauth.new/libqt5-qtnetworkauth.changes
2017-10-24 22:22:34.362672259 +0200
@@ -1,0 +2,7 @@
+Sun Oct 8 14:07:13 UTC 2017 - [email protected]
+
+- Update to 5.9.2
+ * For more details please see:
+ https://blog.qt.io/blog/2017/10/06/qt-5-9-2-released/
+
+-------------------------------------------------------------------
Old:
----
qtnetworkauth-opensource-src-5.9.1.tar.xz
New:
----
qtnetworkauth-opensource-src-5.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtnetworkauth.spec ++++++
--- /var/tmp/diff_new_pack.yd4oDd/_old 2017-10-24 22:22:34.906646831 +0200
+++ /var/tmp/diff_new_pack.yd4oDd/_new 2017-10-24 22:22:34.910646645 +0200
@@ -21,15 +21,15 @@
%define libname libQt5NetworkAuth5
Name: libqt5-qtnetworkauth
-Version: 5.9.1
+Version: 5.9.2
Release: 0
Summary: Qt 5 NetworkAuth Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.io
%define base_name libqt5
-%define real_version 5.9.1
-%define so_version 5.9.1
+%define real_version 5.9.2
+%define so_version 5.9.2
%define tar_version qtnetworkauth-opensource-src-%{real_version}
Source:
https://download.qt.io/official_releases/qt/5.9/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf
++++++ qtnetworkauth-opensource-src-5.9.1.tar.xz ->
qtnetworkauth-opensource-src-5.9.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-opensource-src-5.9.1/.qmake.conf
new/qtnetworkauth-opensource-src-5.9.2/.qmake.conf
--- old/qtnetworkauth-opensource-src-5.9.1/.qmake.conf 2017-05-23
15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/.qmake.conf 2017-09-20
10:13:18.000000000 +0200
@@ -2,4 +2,4 @@
CONFIG += warning_clean
-MODULE_VERSION = 5.9.1
+MODULE_VERSION = 5.9.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-opensource-src-5.9.1/.tag
new/qtnetworkauth-opensource-src-5.9.2/.tag
--- old/qtnetworkauth-opensource-src-5.9.1/.tag 2017-05-23 15:19:16.000000000
+0200
+++ new/qtnetworkauth-opensource-src-5.9.2/.tag 2017-09-20 10:13:18.000000000
+0200
@@ -1 +1 @@
-9c170ef9431f8ceec8d9c474de9d75d8dedaa3b9
+47b80ecae6fe0b9a2c74f0b0feb243145695995e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc
---
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/redditclient/doc/src/qtnetworkauth-redditclient.qdoc
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
---
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/twittertimeline/doc/src/qtnetworkauth-twittertimeline.qdoc
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/twittertimeline/twittertimelinemodel.cpp
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/twittertimeline/twittertimelinemodel.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/examples/oauth/twittertimeline/twittertimelinemodel.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/examples/oauth/twittertimeline/twittertimelinemodel.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -133,11 +133,11 @@
QMessageBox::warning(nullptr, qApp->applicationName(), "Not
authenticated");
QUrl url("https://api.twitter.com/1.1/statuses/home_timeline.json";);
- QUrlQuery query;
+ QVariantMap parameters;
if (tweets.size()) {
// Tweets are time-ordered, newest first. Pass the most recent
// ID we have to request everything more recent than it:
- query.addQueryItem("since_id", QString::number(tweets.first().id));
+ parameters.insert("since_id", QString::number(tweets.first().id));
// From https://dev.twitter.com/rest/reference/get/search/tweets:
// Returns results with an ID greater than (that is, more recent than)
// the specified ID. There are limits to the number of Tweets which can
@@ -145,8 +145,7 @@
// since the since_id, the since_id will be forced to the oldest ID
// available.
}
- url.setQuery(query);
- QNetworkReply *reply = twitter.get(url);
+ QNetworkReply *reply = twitter.get(url, parameters);
connect(reply, &QNetworkReply::finished, this,
&TwitterTimelineModel::parseJson);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth2_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth2_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth2_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth2_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qabstractoauth2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qabstractoauth_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qabstractoauth_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1signature_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1signature_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1signature_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth1signature_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth1signature_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauth2authorizationcodeflow_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.1/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/oauth/qoauthhttpserverreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth2_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth2_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth2_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth2_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qabstractoauth2_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qabstractoauth_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qabstractoauth_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth1_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1signature_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1signature_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1signature_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth1signature_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth1signature_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauth2authorizationcodeflow_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauth2authorizationcodeflow_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
1970-01-01 01:00:00.000000000 +0100
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/5.9.2/QtNetworkAuth/private/qoauthhttpserverreplyhandler_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/oauth/qoauthhttpserverreplyhandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/qtnetworkauthversion.h
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/qtnetworkauthversion.h
---
old/qtnetworkauth-opensource-src-5.9.1/include/QtNetworkAuth/qtnetworkauthversion.h
2017-06-29 01:59:49.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/include/QtNetworkAuth/qtnetworkauthversion.h
2017-10-04 09:26:42.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTNETWORKAUTH_VERSION_H
#define QT_QTNETWORKAUTH_VERSION_H
-#define QTNETWORKAUTH_VERSION_STR "5.9.1"
+#define QTNETWORKAUTH_VERSION_STR "5.9.2"
-#define QTNETWORKAUTH_VERSION 0x050901
+#define QTNETWORKAUTH_VERSION 0x050902
#endif // QT_QTNETWORKAUTH_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/doc/src/qtnetworkauth-examples.qdoc
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/doc/src/qtnetworkauth-examples.qdoc
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/doc/src/qtnetworkauth-examples.qdoc
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/doc/src/qtnetworkauth-examples.qdoc
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/doc/src/qtnetworkauth.qdoc
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/doc/src/qtnetworkauth.qdoc
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/doc/src/qtnetworkauth.qdoc
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/doc/src/qtnetworkauth.qdoc
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/oauth.pro
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/oauth.pro
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/oauth.pro 2017-05-23
15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/oauth.pro 2017-09-20
10:13:18.000000000 +0200
@@ -1,7 +1,7 @@
TARGET = QtNetworkAuth
MODULE = networkauth
-QT += core core-private network
+QT = core core-private network
PUBLIC_HEADERS += \
qoauth1.h \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -103,6 +103,9 @@
\value RequestingAccessToken Preparing the token
request.
+
+ \value RefreshingAccessToken Preparing the access
+ token refresh.
*/
/*!
@@ -171,22 +174,23 @@
*/
/*!
- \fn void authorizeWithBrowser(const QUrl &url)
+ \fn void QAbstractOAuth::authorizeWithBrowser(const QUrl &url)
- This signal is emitted when the URL generated by
- \a resourceOwnerAuthorization is ready to be used in the web
+ This signal is emitted when the \a url generated by
+ resourceOwnerAuthorization() is ready to be used in the web
browser to allow the application to impersonate the user.
+ \sa resourceOwnerAuthorization()
*/
/*!
- \fn void granted()
+ \fn void QAbstractOAuth::granted()
This signal is emitted when the authorization flow finishes
successfully.
*/
/*!
- \fn QNetworkReply *head(const QUrl &url, const QVariantMap ¶meters)
+ \fn QNetworkReply *QAbstractOAuth::head(const QUrl &url, const QVariantMap
¶meters)
Posts an authenticated HEAD request and returns a new
QNetworkReply. The \a url and \a parameters are used to create
@@ -197,7 +201,7 @@
*/
/*!
- \fn QNetworkReply *get(const QUrl &url, const QVariantMap ¶meters)
+ \fn QNetworkReply *QAbstractOAuth::get(const QUrl &url, const QVariantMap
¶meters)
Posts an authenticated GET request and returns a new
QNetworkReply. The \a url and \a parameters are used to create
@@ -208,7 +212,7 @@
*/
/*!
- \fn QNetworkReply *post(const QUrl &url, const QVariantMap ¶meters)
+ \fn QNetworkReply *QAbstractOAuth::post(const QUrl &url, const QVariantMap
¶meters)
Posts an authenticated POST request and returns a new
QNetworkReply. The \a url and \a parameters are used to create
@@ -219,7 +223,7 @@
*/
/*!
- \fn QNetworkReply *deleteResource(const QUrl &url, const QVariantMap
¶meters)
+ \fn QNetworkReply *QAbstractOAuth::deleteResource(const QUrl &url, const
QVariantMap ¶meters)
Posts an authenticated DELETE request and returns a new
QNetworkReply. The \a url and \a parameters are used to create
@@ -230,7 +234,7 @@
*/
/*!
- \fn void grant()
+ \fn void QAbstractOAuth::grant()
Override this function to implement the corresponding
authentication flow in the subclasses. Client code calls this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -80,7 +80,8 @@
enum class Stage {
RequestingTemporaryCredentials,
RequestingAuthorization,
- RequestingAccessToken
+ RequestingAccessToken,
+ RefreshingAccessToken
};
enum class Error {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -229,7 +229,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->head(d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -245,7 +245,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->get(d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -262,7 +262,7 @@
Q_D(QAbstractOAuth2);
const auto data = d->convertParameters(parameters);
QNetworkReply *reply =
d->networkAccessManager()->post(d->createRequest(url), data);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -279,7 +279,7 @@
Q_D(QAbstractOAuth2);
QNetworkReply *reply = d->networkAccessManager()->deleteResource(
d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2_p.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth2_p.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth2_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth_p.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauth_p.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauth_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauthreplyhandler.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauthreplyhandler.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauthreplyhandler.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauthreplyhandler.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauthreplyhandler.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauthreplyhandler.h
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qabstractoauthreplyhandler.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qabstractoauthreplyhandler.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -156,7 +156,7 @@
QAbstractOAuthReplyHandler *handler = replyHandler ? replyHandler.data()
:
defaultReplyHandler.data();
QObject::connect(reply, &QNetworkReply::finished,
-
std::bind(&QAbstractOAuthReplyHandler::networkReplyFinished, handler, reply));
+ [handler, reply]() {
handler->networkReplyFinished(reply); });
connect(handler, &QAbstractOAuthReplyHandler::tokensReceived, this,
&QOAuth1Private::_q_tokensReceived);
@@ -417,7 +417,7 @@
QNetworkRequest request(url);
setup(&request, parameters, QNetworkAccessManager::GetOperation);
QNetworkReply *reply = d->networkAccessManager()->get(request);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -434,7 +434,7 @@
const QByteArray data = d->convertParameters(parameters);
QNetworkReply *reply = d->networkAccessManager()->post(request, data);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -448,7 +448,7 @@
QNetworkRequest request(url);
setup(&request, parameters, QNetworkAccessManager::DeleteOperation);
QNetworkReply *reply = d->networkAccessManager()->deleteResource(request);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -505,7 +505,7 @@
if (operation == QNetworkAccessManager::GetOperation) {
if (signingParameters.size()) {
QUrl url = request->url();
- QUrlQuery query;
+ QUrlQuery query = QUrlQuery(url.query());
for (auto it = signingParameters.begin(), end =
signingParameters.end(); it != end;
++it)
query.addQueryItem(it.key(), it.value().toString());
@@ -597,9 +597,7 @@
// https://tools.ietf.org/html/rfc5849#section-2.2
resourceOwnerAuthorization(d->authorizationUrl, parameters);
}
- } else if (status == Status::Granted) {
- Q_EMIT granted();
- } else {
+ } else if (status == Status::NotAuthenticated) {
// Inherit class called
QAbstractOAuth::setStatus(Status::NotAuthenticated);
setTokenCredentials(QString(), QString());
disconnect(connection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1.h 2017-05-23
15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1.h 2017-09-20
10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1_p.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1_p.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -96,7 +96,9 @@
QVariantMap p = parameters;
{
- const auto queryItems = QUrlQuery(url.query()).queryItems();
+ // replace '+' with spaces now before decoding so that '%2B' gets left
as '+'
+ const QString query = url.query().replace(QLatin1Char('+'),
QLatin1Char(' '));
+ const auto queryItems =
QUrlQuery(query).queryItems(QUrl::FullyDecoded);
for (auto it = queryItems.begin(), end = queryItems.end(); it != end;
++it)
p.insert(it->first, it->second);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature_p.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth1signature_p.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth1signature_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -328,6 +328,8 @@
parameters.insert(Key::grantType, QStringLiteral("refresh_token"));
parameters.insert(Key::refreshToken, d->refreshToken);
parameters.insert(Key::redirectUri, QUrl::toPercentEncoding(callback()));
+ if (d->modifyParametersFunction)
+ d->modifyParametersFunction(Stage::RefreshingAccessToken, ¶meters);
query = QAbstractOAuthPrivate::createQuery(parameters);
request.setHeader(QNetworkRequest::ContentTypeHeader,
QStringLiteral("application/x-www-form-urlencoded"));
@@ -336,11 +338,11 @@
d->currentReply = d->networkAccessManager()->post(request, data.toUtf8());
d->status = Status::RefreshingToken;
- connect(d->currentReply.data(), &QNetworkReply::finished,
- std::bind(&QAbstractOAuthReplyHandler::networkReplyFinished,
replyHandler(),
- d->currentReply.data()));
- connect(d->currentReply.data(), &QNetworkReply::finished,
d->currentReply.data(),
- &QNetworkReply::deleteLater);
+ QNetworkReply *reply = d->currentReply.data();
+ QAbstractOAuthReplyHandler *handler = replyHandler();
+ connect(reply, &QNetworkReply::finished,
+ [handler, reply]() { handler->networkReplyFinished(reply); });
+ connect(reply, &QNetworkReply::finished, reply,
&QNetworkReply::deleteLater);
QObjectPrivate::connect(d->networkAccessManager(),
&QNetworkAccessManager::authenticationRequired,
d,
&QOAuth2AuthorizationCodeFlowPrivate::_q_authenticate,
@@ -405,10 +407,11 @@
QStringLiteral("application/x-www-form-urlencoded"));
const QString data = query.toString(QUrl::FullyEncoded);
- d->currentReply = d->networkAccessManager()->post(request, data.toUtf8());
- QObject::connect(d->currentReply.data(), &QNetworkReply::finished,
-
std::bind(&QAbstractOAuthReplyHandler::networkReplyFinished, replyHandler(),
- d->currentReply.data()));
+ QNetworkReply *reply = d->networkAccessManager()->post(request,
data.toUtf8());
+ d->currentReply = reply;
+ QAbstractOAuthReplyHandler *handler = replyHandler();
+ QObject::connect(reply, &QNetworkReply::finished,
+ [handler, reply] { handler->networkReplyFinished(reply);
});
QObjectPrivate::connect(d->replyHandler.data(),
&QAbstractOAuthReplyHandler::tokensReceived, d,
&QOAuth2AuthorizationCodeFlowPrivate::_q_accessTokenRequestFinished,
Qt::UniqueConnection);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow.h
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauth2authorizationcodeflow_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauth2authorizationcodeflow_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthglobal.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthglobal.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthglobal.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthglobal.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -52,7 +52,7 @@
text(QObject::tr("Callback received. Feel free to close this page.")),
q_ptr(p)
{
QObject::connect(&httpServer, &QTcpServer::newConnection,
-
std::bind(&QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected, this));
+ [this]() { _q_clientConnected(); });
}
QOAuthHttpServerReplyHandlerPrivate::~QOAuthHttpServerReplyHandlerPrivate()
@@ -67,7 +67,7 @@
QObject::connect(socket, &QTcpSocket::disconnected, socket,
&QTcpSocket::deleteLater);
QObject::connect(socket, &QTcpSocket::readyRead,
-
std::bind(&QOAuthHttpServerReplyHandlerPrivate::_q_readData, this, socket));
+ [this, socket]() { _q_readData(socket); });
}
void QOAuthHttpServerReplyHandlerPrivate::_q_readData(QTcpSocket *socket)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler.h
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler_p.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler_p.h
---
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthhttpserverreplyhandler_p.h
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthhttpserverreplyhandler_p.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthoobreplyhandler.cpp
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthoobreplyhandler.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthoobreplyhandler.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthoobreplyhandler.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
@@ -75,7 +75,8 @@
if (contentType.startsWith(QStringLiteral("text/html")) ||
contentType.startsWith(QStringLiteral("application/x-www-form-urlencoded"))) {
ret = parseResponse(data);
- } else if (contentType.startsWith(QStringLiteral("application/json"))) {
+ } else if (contentType.startsWith(QStringLiteral("application/json"))
+ || contentType.startsWith(QStringLiteral("text/javascript"))) {
const QJsonDocument document = QJsonDocument::fromJson(data);
if (!document.isObject()) {
qWarning("QOAuthOobReplyHandler::networkReplyFinished: Received
data is not a JSON"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthoobreplyhandler.h
new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthoobreplyhandler.h
--- old/qtnetworkauth-opensource-src-5.9.1/src/oauth/qoauthoobreplyhandler.h
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/src/oauth/qoauthoobreplyhandler.h
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Network Auth module of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauth1/tst_oauth1.cpp
new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauth1/tst_oauth1.cpp
--- old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauth1/tst_oauth1.cpp
2017-05-23 15:19:16.000000000 +0200
+++ new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauth1/tst_oauth1.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@@ -29,6 +29,7 @@
#include <QtCore>
#include <QtTest>
#include <QtNetwork>
+#include <QHostInfo>
#include <QtNetworkAuth/qoauth1.h>
@@ -140,6 +141,22 @@
void authenticatedCalls();
};
+bool hostReachable(const QLatin1String &host)
+{
+ // check host exists
+ QHostInfo hostInfo = QHostInfo::fromName(host);
+ if (hostInfo.error() != QHostInfo::NoError)
+ return false;
+
+ // try to connect to host
+ QTcpSocket socket;
+ socket.connectToHost(host, 80);
+ if (!socket.waitForConnected(1000))
+ return false;
+
+ return true;
+}
+
int tst_OAuth1::waitForFinish(QNetworkReplyPtr &reply)
{
int count = 0;
@@ -291,76 +308,77 @@
// term.ie
const StringPair emptyCredentials;
-
- QTest::newRow("term.ie_request_get") << qMakePair(QStringLiteral("key"),
- QStringLiteral("secret"))
- << emptyCredentials
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
QUrl("http://term.ie/oauth/example/request_token.php";)
- <<
QNetworkAccessManager::GetOperation;
-
- QTest::newRow("term.ie_request_post") << qMakePair(QStringLiteral("key"),
-
QStringLiteral("secret"))
- << emptyCredentials
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
QUrl("http://term.ie/oauth/example/request_token.php";)
- <<
QNetworkAccessManager::PostOperation;
-
- QTest::newRow("term.ie_access_get") << qMakePair(QStringLiteral("key"),
- QStringLiteral("secret"))
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
qMakePair(QStringLiteral("accesskey"),
-
QStringLiteral("accesssecret"))
- <<
QUrl("http://term.ie/oauth/example/access_token.php";)
- << QNetworkAccessManager::GetOperation;
-
- QTest::newRow("term.ie_access_post") << qMakePair(QStringLiteral("key"),
- QStringLiteral("secret"))
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
qMakePair(QStringLiteral("accesskey"),
-
QStringLiteral("accesssecret"))
- <<
QUrl("http://term.ie/oauth/example/access_token.php";)
- <<
QNetworkAccessManager::PostOperation;
-
+ if (hostReachable(QLatin1String("term.ie"))) {
+ QTest::newRow("term.ie_request_get") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ << emptyCredentials
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
QUrl("http://term.ie/oauth/example/request_token.php";)
+ <<
QNetworkAccessManager::GetOperation;
+
+ QTest::newRow("term.ie_request_post") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ << emptyCredentials
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
QUrl("http://term.ie/oauth/example/request_token.php";)
+ <<
QNetworkAccessManager::PostOperation;
+
+ QTest::newRow("term.ie_access_get") << qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
qMakePair(QStringLiteral("accesskey"),
+
QStringLiteral("accesssecret"))
+ <<
QUrl("http://term.ie/oauth/example/access_token.php";)
+ <<
QNetworkAccessManager::GetOperation;
+
+ QTest::newRow("term.ie_access_post") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
qMakePair(QStringLiteral("accesskey"),
+
QStringLiteral("accesssecret"))
+ <<
QUrl("http://term.ie/oauth/example/access_token.php";)
+ <<
QNetworkAccessManager::PostOperation;
+ }
// oauthbin.com
+ if (hostReachable(QLatin1String("oauthbin.com"))) {
+ QTest::newRow("oauthbin.com_request_get") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ << emptyCredentials
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
QUrl("http://oauthbin.com/v1/request-token";)
+ <<
QNetworkAccessManager::GetOperation;
- QTest::newRow("oauthbin.com_request_get") <<
qMakePair(QStringLiteral("key"),
-
QStringLiteral("secret"))
- << emptyCredentials
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
QUrl("http://oauthbin.com/v1/request-token";)
- <<
QNetworkAccessManager::GetOperation;
+ QTest::newRow("oauthbin.com_request_post") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ << emptyCredentials
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
QUrl("http://oauthbin.com/v1/request-token";)
+ <<
QNetworkAccessManager::PostOperation;
- QTest::newRow("oauthbin.com_request_post") <<
qMakePair(QStringLiteral("key"),
+ QTest::newRow("oauthbin.com_access_get") <<
qMakePair(QStringLiteral("key"),
QStringLiteral("secret"))
- << emptyCredentials
- <<
qMakePair(QStringLiteral("requestkey"),
+ <<
qMakePair(QStringLiteral("requestkey"),
QStringLiteral("requestsecret"))
- <<
QUrl("http://oauthbin.com/v1/request-token";)
- <<
QNetworkAccessManager::PostOperation;
+ <<
qMakePair(QStringLiteral("accesskey"),
+
QStringLiteral("accesssecret"))
+ <<
QUrl("http://oauthbin.com/v1/access-token";)
+ <<
QNetworkAccessManager::GetOperation;
- QTest::newRow("oauthbin.com_access_get") <<
qMakePair(QStringLiteral("key"),
-
QStringLiteral("secret"))
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
qMakePair(QStringLiteral("accesskey"),
-
QStringLiteral("accesssecret"))
- <<
QUrl("http://oauthbin.com/v1/access-token";)
- <<
QNetworkAccessManager::GetOperation;
-
- QTest::newRow("oauthbin.com_access_post") <<
qMakePair(QStringLiteral("key"),
-
QStringLiteral("secret"))
- <<
qMakePair(QStringLiteral("requestkey"),
-
QStringLiteral("requestsecret"))
- <<
qMakePair(QStringLiteral("accesskey"),
-
QStringLiteral("accesssecret"))
- <<
QUrl("http://oauthbin.com/v1/access-token";)
- <<
QNetworkAccessManager::PostOperation;
+ QTest::newRow("oauthbin.com_access_post") <<
qMakePair(QStringLiteral("key"),
+
QStringLiteral("secret"))
+ <<
qMakePair(QStringLiteral("requestkey"),
+
QStringLiteral("requestsecret"))
+ <<
qMakePair(QStringLiteral("accesskey"),
+
QStringLiteral("accesssecret"))
+ <<
QUrl("http://oauthbin.com/v1/access-token";)
+ <<
QNetworkAccessManager::PostOperation;
+ }
}
void tst_OAuth1::getToken()
@@ -410,46 +428,50 @@
QTest::addColumn<QUrl>("authenticatedCallUrl");
QTest::addColumn<QNetworkAccessManager::Operation>("requestType");
- QTest::newRow("term.ie_get") << "key"
- << "secret"
- << "requestkey"
- << "requestsecret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://term.ie/oauth/example/request_token.php";)
- <<
QUrl("http://term.ie/oauth/example/access_token.php";)
- <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
- << QNetworkAccessManager::GetOperation;
- QTest::newRow("term.ie_post") << "key"
- << "secret"
- << "requestkey"
- << "requestsecret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://term.ie/oauth/example/request_token.php";)
- <<
QUrl("http://term.ie/oauth/example/access_token.php";)
- <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
- << QNetworkAccessManager::PostOperation;
- QTest::newRow("oauthbin.com_get") << "key"
- << "secret"
- << "requestkey"
- << "requestsecret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://oauthbin.com/v1/request-token";)
- <<
QUrl("http://oauthbin.com/v1/access-token";)
- << QUrl("http://oauthbin.com/v1/echo";)
- << QNetworkAccessManager::GetOperation;
- QTest::newRow("oauthbin.com_post") << "key"
- << "secret"
- << "requestkey"
- << "requestsecret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://oauthbin.com/v1/request-token";)
- <<
QUrl("http://oauthbin.com/v1/access-token";)
- << QUrl("http://oauthbin.com/v1/echo";)
- << QNetworkAccessManager::PostOperation;
+ if (hostReachable(QLatin1String("term.ie"))) {
+ QTest::newRow("term.ie_get") << "key"
+ << "secret"
+ << "requestkey"
+ << "requestsecret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://term.ie/oauth/example/request_token.php";)
+ <<
QUrl("http://term.ie/oauth/example/access_token.php";)
+ <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
+ << QNetworkAccessManager::GetOperation;
+ QTest::newRow("term.ie_post") << "key"
+ << "secret"
+ << "requestkey"
+ << "requestsecret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://term.ie/oauth/example/request_token.php";)
+ <<
QUrl("http://term.ie/oauth/example/access_token.php";)
+ <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
+ << QNetworkAccessManager::PostOperation;
+ }
+ if (hostReachable(QLatin1String("oauthbin.com"))) {
+ QTest::newRow("oauthbin.com_get") << "key"
+ << "secret"
+ << "requestkey"
+ << "requestsecret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://oauthbin.com/v1/request-token";)
+ <<
QUrl("http://oauthbin.com/v1/access-token";)
+ << QUrl("http://oauthbin.com/v1/echo";)
+ << QNetworkAccessManager::GetOperation;
+ QTest::newRow("oauthbin.com_post") << "key"
+ << "secret"
+ << "requestkey"
+ << "requestsecret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://oauthbin.com/v1/request-token";)
+ <<
QUrl("http://oauthbin.com/v1/access-token";)
+ << QUrl("http://oauthbin.com/v1/echo";)
+ <<
QNetworkAccessManager::PostOperation;
+ }
}
void tst_OAuth1::grant()
@@ -503,11 +525,13 @@
QEventLoop eventLoop;
+ QSignalSpy grantSignalSpy(&o1, &QOAuth1::granted);
QTimer::singleShot(10000, &eventLoop, &QEventLoop::quit);
connect(&o1, &QOAuth1::granted, &eventLoop, &QEventLoop::quit);
o1.grant();
eventLoop.exec();
QVERIFY(tokenReceived);
+ QCOMPARE(grantSignalSpy.count(), 1);
QCOMPARE(o1.status(), QAbstractOAuth::Status::Granted);
}
@@ -527,34 +551,54 @@
{ QStringLiteral("c2&a3"),
QStringLiteral("2=%$&@q") }
};
- QTest::newRow("term.ie_get") << "key"
- << "secret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
- << parameters
- << QNetworkAccessManager::GetOperation;
- QTest::newRow("term.ie_post") << "key"
- << "secret"
- << "accesskey"
- << "accesssecret"
- <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
- << parameters
- << QNetworkAccessManager::PostOperation;
- QTest::newRow("oauthbin.com_get") << "key"
- << "secret"
- << "accesskey"
- << "accesssecret"
- << QUrl("http://oauthbin.com/v1/echo";)
- << parameters
- << QNetworkAccessManager::GetOperation;
- QTest::newRow("oauthbin.com_post") << "key"
- << "secret"
- << "accesskey"
- << "accesssecret"
- << QUrl("http://oauthbin.com/v1/echo";)
- << parameters
- << QNetworkAccessManager::PostOperation;
+ if (hostReachable(QLatin1String("term.ie"))) {
+ QTest::newRow("term.ie_get") << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
+ << parameters
+ << QNetworkAccessManager::GetOperation;
+ QTest::newRow("term.ie_post") << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://term.ie/oauth/example/echo_api.php";)
+ << parameters
+ << QNetworkAccessManager::PostOperation;
+ QTest::newRow("term.ie_percent_encoded_query")
+ << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ <<
QUrl("http://term.ie/oauth/example/echo_api.php?key=%40value+1%2B2=3";)
+ << parameters
+ << QNetworkAccessManager::GetOperation;
+ }
+ if (hostReachable(QLatin1String("oauthbin.com"))) {
+ QTest::newRow("oauthbin.com_get") << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ << QUrl("http://oauthbin.com/v1/echo";)
+ << parameters
+ << QNetworkAccessManager::GetOperation;
+ QTest::newRow("oauthbin.com_post") << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ << QUrl("http://oauthbin.com/v1/echo";)
+ << parameters
+ <<
QNetworkAccessManager::PostOperation;
+ QTest::newRow("oauthbin.com_percent_encoded_query")
+ << "key"
+ << "secret"
+ << "accesskey"
+ << "accesssecret"
+ << QUrl("http://oauthbin.com/v1/echo?key=%40value+1%2B2=3";)
+ << parameters
+ << QNetworkAccessManager::GetOperation;
+ }
}
void tst_OAuth1::authenticatedCalls()
@@ -572,6 +616,11 @@
QString receivedData;
QString parametersString;
{
+ if (url.hasQuery()) {
+ parametersString = url.query(QUrl::FullyDecoded);
+ if (!parameters.empty())
+ parametersString.append(QLatin1Char('&'));
+ }
bool first = true;
for (auto it = parameters.begin(), end = parameters.end(); it != end;
++it) {
if (first)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauth1signature/tst_oauth1signature.cpp
new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauth1signature/tst_oauth1signature.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauth1signature/tst_oauth1signature.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauth1signature/tst_oauth1signature.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
---
old/qtnetworkauth-opensource-src-5.9.1/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
2017-05-23 15:19:16.000000000 +0200
+++
new/qtnetworkauth-opensource-src-5.9.2/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
2017-09-20 10:13:18.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
