Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-networkauth for openSUSE:Factory
checked in at 2024-04-08 17:37:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-networkauth (Old)
and /work/SRC/openSUSE:Factory/.qt6-networkauth.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-networkauth"
Mon Apr 8 17:37:49 2024 rev:28 rq:1165791 version:6.7.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-networkauth/qt6-networkauth.changes
2024-03-28 14:07:21.674150098 +0100
+++
/work/SRC/openSUSE:Factory/.qt6-networkauth.new.1905/qt6-networkauth.changes
2024-04-08 17:38:28.895135547 +0200
@@ -1,0 +2,6 @@
+Tue Apr 2 13:39:47 UTC 2024 - Christophe Marin <[email protected]>
+
+- Update to 6.7.0:
+ * https://www.qt.io/blog/qt-6.7-released
+
+-------------------------------------------------------------------
Old:
----
qtnetworkauth-everywhere-src-6.6.3.tar.xz
New:
----
qtnetworkauth-everywhere-src-6.7.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-networkauth.spec ++++++
--- /var/tmp/diff_new_pack.I2dSDN/_old 2024-04-08 17:38:30.055178365 +0200
+++ /var/tmp/diff_new_pack.I2dSDN/_new 2024-04-08 17:38:30.059178512 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.6.3
-%define short_version 6.6
+%define real_version 6.7.0
+%define short_version 6.7
%define short_name qtnetworkauth
%define tar_name qtnetworkauth-everywhere-src
%define tar_suffix %{nil}
@@ -28,7 +28,7 @@
%endif
#
Name: qt6-networkauth%{?pkg_suffix}
-Version: 6.6.3
+Version: 6.7.0
Release: 0
Summary: Set of APIs to obtain limited access to online accounts and
HTTP services
License: GPL-3.0-only WITH Qt-GPL-exception-1.0
++++++ qtnetworkauth-everywhere-src-6.6.3.tar.xz ->
qtnetworkauth-everywhere-src-6.7.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.6.3/.cmake.conf
new/qtnetworkauth-everywhere-src-6.7.0/.cmake.conf
--- old/qtnetworkauth-everywhere-src-6.6.3/.cmake.conf 2024-03-18
17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/.cmake.conf 2024-03-22
12:24:03.000000000 +0100
@@ -1,3 +1,5 @@
-set(QT_REPO_MODULE_VERSION "6.6.3")
+set(QT_REPO_MODULE_VERSION "6.7.0")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1")
+list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.6.3/.tag
new/qtnetworkauth-everywhere-src-6.7.0/.tag
--- old/qtnetworkauth-everywhere-src-6.6.3/.tag 2024-03-18 17:52:38.000000000
+0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/.tag 2024-03-22 12:24:03.000000000
+0100
@@ -1 +1 @@
-55af7eba57ac8c786290f88046da5a6b59b856ec
+33a58af35ded52c430b802e191a6faffb8e418c0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/coin/axivion/ci_config_linux.json
new/qtnetworkauth-everywhere-src-6.7.0/coin/axivion/ci_config_linux.json
--- old/qtnetworkauth-everywhere-src-6.6.3/coin/axivion/ci_config_linux.json
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/coin/axivion/ci_config_linux.json
2024-03-22 12:24:03.000000000 +0100
@@ -1,9 +1,5 @@
{
"Project": {
- "Git": {
- "_active": true,
- "sourceserver_gitdir":
"/data/axivion/databases/$(env:TESTED_MODULE_COIN).git"
- },
"BuildSystemIntegration": {
"child_order": [
"GCCSetup",
@@ -31,29 +27,14 @@
"build/lib/lib*.so*.ir"
],
"ir": "build/$(env:TESTED_MODULE_COIN).ir"
- },
- "Project-GlobalOptions": {
- "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
- "ir": "build/$(env:TESTED_MODULE_COIN).ir",
- "name": "qt_$(env:TESTED_MODULE_COIN)_dev_$(env:TARGET_OS_COIN)"
- }
- },
- "Results": {
- "Dashboard": {
- "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/";
- },
- "Database": {
- "ci_mode": {
- "directory": "/data/axivion/databases"
- }
}
},
"_Format": "1.0",
- "_Version": "trunk-9e0ef9c5818",
+ "_Version": "7.6.2",
"_VersionNum": [
7,
6,
- 9999,
- 11489
+ 2,
+ 12725
]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.6.3/dependencies.yaml
new/qtnetworkauth-everywhere-src-6.7.0/dependencies.yaml
--- old/qtnetworkauth-everywhere-src-6.6.3/dependencies.yaml 2024-03-18
17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/dependencies.yaml 2024-03-22
12:24:03.000000000 +0100
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: afdec885058c92e24604f398a926297222da06f3
+ ref: 98602c26fc97eb41e3dd7548194ca637420a31b9
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qabstractoauth2.cpp
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qabstractoauth2.cpp
--- old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qabstractoauth2.cpp
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qabstractoauth2.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -236,7 +236,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->head(d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -252,7 +252,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->get(d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -287,7 +287,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->post(d->createRequest(url), data);
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -307,7 +307,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->post(d->createRequest(url), multiPart);
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -342,7 +342,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->put(d->createRequest(url), data);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, this,
std::bind(&QAbstractOAuth::finished, this, reply));
return reply;
}
@@ -362,7 +362,7 @@
{
Q_D(QAbstractOAuth2);
QNetworkReply *reply =
d->networkAccessManager()->put(d->createRequest(url), multiPart);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, this,
std::bind(&QAbstractOAuth::finished, this, reply));
return reply;
}
@@ -379,7 +379,7 @@
Q_D(QAbstractOAuth2);
QNetworkReply *reply = d->networkAccessManager()->deleteResource(
d->createRequest(url, ¶meters));
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qabstractoauth_p.h
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qabstractoauth_p.h
--- old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qabstractoauth_p.h
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qabstractoauth_p.h
2024-03-22 12:24:03.000000000 +0100
@@ -32,6 +32,8 @@
#include <QtNetwork/qtcpserver.h>
#include <QtNetwork/qnetworkaccessmanager.h>
+#include <QtCore/qpointer.h>
+
QT_BEGIN_NAMESPACE
class QUrlQuery;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth1.cpp
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth1.cpp
--- old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth1.cpp
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth1.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -192,7 +192,7 @@
QAbstractOAuthReplyHandler *handler = replyHandler ? replyHandler.data()
:
defaultReplyHandler.data();
- QObject::connect(reply, &QNetworkReply::finished,
+ QObject::connect(reply, &QNetworkReply::finished, handler,
[handler, reply]() {
handler->networkReplyFinished(reply); });
connect(handler, &QAbstractOAuthReplyHandler::tokensReceived, this,
&QOAuth1Private::_q_tokensReceived);
@@ -609,7 +609,7 @@
QNetworkRequest request(url);
setup(&request, parameters, QNetworkAccessManager::GetOperation);
QNetworkReply *reply = d->networkAccessManager()->get(request);
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -634,7 +634,7 @@
const QByteArray data = d->convertParameters(parameters);
QNetworkReply *reply = d->networkAccessManager()->post(request, data);
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -659,7 +659,7 @@
const QByteArray data = d->convertParameters(parameters);
QNetworkReply *reply = d->networkAccessManager()->put(request, data);
- connect(reply, &QNetworkReply::finished,
std::bind(&QAbstractOAuth::finished, this, reply));
+ connect(reply, &QNetworkReply::finished, this,
std::bind(&QAbstractOAuth::finished, this, reply));
return reply;
}
@@ -681,7 +681,7 @@
QNetworkRequest request(url);
setup(&request, parameters, QNetworkAccessManager::DeleteOperation);
QNetworkReply *reply = d->networkAccessManager()->deleteResource(request);
- connect(reply, &QNetworkReply::finished, [this, reply]() { emit
finished(reply); });
+ connect(reply, &QNetworkReply::finished, this, [this, reply]() { emit
finished(reply); });
return reply;
}
@@ -855,7 +855,7 @@
}
QMetaObject::Connection connection;
- connection = connect(this, &QAbstractOAuth::statusChanged, [&](Status
status) {
+ connection = connect(this, &QAbstractOAuth::statusChanged, this,
[&](Status status) {
Q_D(QOAuth1);
if (status == Status::TemporaryCredentialsReceived) {
@@ -883,8 +883,8 @@
auto httpReplyHandler =
qobject_cast<QOAuthHttpServerReplyHandler*>(replyHandler());
if (httpReplyHandler) {
- connect(httpReplyHandler,
&QOAuthHttpServerReplyHandler::callbackReceived, [&](
- const QVariantMap &values) {
+ auto func = [this](const QVariantMap &values) {
+ Q_D(QOAuth1);
QString verifier = values.value(OAuth1::oauthVerifier).toString();
if (verifier.isEmpty()) {
qCWarning(d->loggingCategory, "%s not found in the callback",
@@ -892,7 +892,8 @@
return;
}
continueGrantWithVerifier(verifier);
- });
+ };
+ connect(httpReplyHandler,
&QOAuthHttpServerReplyHandler::callbackReceived, this, func);
}
// requesting temporary credentials
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth2authorizationcodeflow.cpp
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth2authorizationcodeflow.cpp
---
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth2authorizationcodeflow.cpp
2024-03-18 17:52:38.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth2authorizationcodeflow.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -349,7 +349,7 @@
QNetworkReply *reply = d->currentReply.data();
QAbstractOAuthReplyHandler *handler = replyHandler();
- connect(reply, &QNetworkReply::finished,
+ connect(reply, &QNetworkReply::finished, handler,
[handler, reply]() { handler->networkReplyFinished(reply); });
connect(reply, &QNetworkReply::finished, reply,
&QNetworkReply::deleteLater);
QObjectPrivate::connect(d->replyHandler.data(),
&QAbstractOAuthReplyHandler::tokensReceived, d,
@@ -430,7 +430,7 @@
QNetworkReply *reply = d->networkAccessManager()->post(request,
data.toUtf8());
d->currentReply = reply;
QAbstractOAuthReplyHandler *handler = replyHandler();
- QObject::connect(reply, &QNetworkReply::finished,
+ QObject::connect(reply, &QNetworkReply::finished, handler,
[handler, reply] { handler->networkReplyFinished(reply);
});
connect(reply, &QNetworkReply::finished, reply,
&QNetworkReply::deleteLater);
QObjectPrivate::connect(d->replyHandler.data(),
&QAbstractOAuthReplyHandler::tokensReceived, d,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth2authorizationcodeflow_p.h
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth2authorizationcodeflow_p.h
---
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauth2authorizationcodeflow_p.h
2024-03-18 17:52:38.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauth2authorizationcodeflow_p.h
2024-03-22 12:24:03.000000000 +0100
@@ -22,6 +22,7 @@
#include <QtNetworkAuth/qoauthglobal.h>
#include <QtNetworkAuth/qoauth2authorizationcodeflow.h>
+#include <QtCore/qpointer.h>
#include <QtCore/qstring.h>
#include <QtCore/qdatetime.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauthhttpserverreplyhandler.cpp
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauthhttpserverreplyhandler.cpp
---
old/qtnetworkauth-everywhere-src-6.6.3/src/oauth/qoauthhttpserverreplyhandler.cpp
2024-03-18 17:52:38.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.7.0/src/oauth/qoauthhttpserverreplyhandler.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -29,7 +29,7 @@
QOAuthHttpServerReplyHandler *p) :
text(QObject::tr("Callback received. Feel free to close this page.")),
q_ptr(p)
{
- QObject::connect(&httpServer, &QTcpServer::newConnection,
+ QObject::connect(&httpServer, &QTcpServer::newConnection, q_ptr,
[this]() { _q_clientConnected(); });
}
@@ -44,7 +44,7 @@
QTcpSocket *socket = httpServer.nextPendingConnection();
QObject::connect(socket, &QTcpSocket::disconnected, socket,
&QTcpSocket::deleteLater);
- QObject::connect(socket, &QTcpSocket::readyRead,
+ QObject::connect(socket, &QTcpSocket::readyRead, q_ptr,
[this, socket]() { _q_readData(socket); });
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtnetworkauth-everywhere-src-6.6.3/sync.profile
new/qtnetworkauth-everywhere-src-6.7.0/sync.profile
--- old/qtnetworkauth-everywhere-src-6.6.3/sync.profile 2024-03-18
17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/sync.profile 1970-01-01
01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-%modules = (
- "QtNetworkAuth" => "$basedir/src/oauth",
-);
-
-%moduleheaders = (
-);
-
-%dependencies = (
- "qtbase" => "",
-);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/abstractoauth/tst_abstractoauth.cpp
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/abstractoauth/tst_abstractoauth.cpp
---
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/abstractoauth/tst_abstractoauth.cpp
2024-03-18 17:52:38.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/abstractoauth/tst_abstractoauth.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -51,7 +51,7 @@
const QUrl defaultValue = obj.authorizationUrl();
QVERIFY(expectedValue != defaultValue);
bool emitted = false;
- connect(&obj, &QAbstractOAuth::authorizationUrlChanged, [&](const QUrl
&value) {
+ connect(&obj, &QAbstractOAuth::authorizationUrlChanged, this, [&](const
QUrl &value) {
QCOMPARE(expectedValue, value);
emitted = true;
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauth1/tst_oauth1.cpp
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauth1/tst_oauth1.cpp
--- old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauth1/tst_oauth1.cpp
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauth1/tst_oauth1.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -72,7 +72,7 @@
QOAuth1 obj;
Type expectedValue;
QSignalSpy spy(&obj, signal);
- connect(&obj, signal, [&](const Type &value) {
+ connect(&obj, signal, &obj, [&](const Type &value) {
QCOMPARE(expectedValue, value);
});
for (const auto &setter : setters) {
@@ -431,10 +431,10 @@
QVariantMap parameters {{ "c2&a3", "c2=a3" }};
reply.reset(o1.requestTokenCredentials(requestType, url, token,
parameters));
QVERIFY(!reply.isNull());
- connect(&o1, &QOAuth1::tokenChanged, [&tokenReceived](const QString
&token){
+ connect(&o1, &QOAuth1::tokenChanged, this, [&tokenReceived](const QString
&token){
tokenReceived.first = token;
});
- connect(&o1, &QOAuth1::tokenSecretChanged, [&tokenReceived](const QString
&tokenSecret) {
+ connect(&o1, &QOAuth1::tokenSecretChanged, this, [&tokenReceived](const
QString &tokenSecret) {
tokenReceived.second = tokenSecret;
});
QVERIFY(waitForFinish(reply) == Success);
@@ -652,7 +652,7 @@
o1.setTokenCredentialsUrl(accessTokenUrl);
QCOMPARE(spy.size(), 1);
}
- connect(&o1, &QAbstractOAuth::statusChanged, [&](QAbstractOAuth::Status
status) {
+ connect(&o1, &QAbstractOAuth::statusChanged, this,
[&](QAbstractOAuth::Status status) {
if (status == QAbstractOAuth::Status::TemporaryCredentialsReceived) {
if (!requestToken.isEmpty())
QCOMPARE(requestToken, o1.tokenCredentials().first);
@@ -764,7 +764,7 @@
QVERIFY(!reply.isNull());
QVERIFY(!reply->isFinished());
- connect(&networkAccessManager, &QNetworkAccessManager::finished,
+ connect(&networkAccessManager, &QNetworkAccessManager::finished, this,
[&](QNetworkReply *reply) {
QByteArray data = reply->readAll();
QUrlQuery query(QString::fromUtf8(data));
@@ -878,7 +878,7 @@
QVERIFY(!reply.isNull());
QVERIFY(!reply->isFinished());
- connect(&networkAccessManager, &QNetworkAccessManager::finished,
+ connect(&networkAccessManager, &QNetworkAccessManager::finished, this,
[&](QNetworkReply *reply) {
QByteArray data = reply->readAll();
QUrlQuery query(QString::fromUtf8(data));
@@ -916,11 +916,12 @@
o1.setTokenCredentialsUrl(webServer.url(QStringLiteral("token")));
StringPair tokenReceived;
- connect(&o1, &QOAuth1::tokenChanged, [&tokenReceived](const QString
&token) {
+ connect(&o1, &QOAuth1::tokenChanged, this, [&tokenReceived](const QString
&token) {
tokenReceived.first = token;
});
bool replyReceived = false;
- connect(&o1, &QOAuth1::tokenSecretChanged, [&tokenReceived,
&replyReceived](const QString &tokenSecret) {
+ connect(&o1, &QOAuth1::tokenSecretChanged,
+ this, [&tokenReceived, &replyReceived](const QString &tokenSecret)
{
tokenReceived.second = tokenSecret;
replyReceived = true;
});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauth2/tst_oauth2.cpp
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauth2/tst_oauth2.cpp
--- old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauth2/tst_oauth2.cpp
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauth2/tst_oauth2.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -178,7 +178,8 @@
oauth2.setAccessTokenUrl(webServer.url(QLatin1String("accessToken")));
ReplyHandler replyHandler;
oauth2.setReplyHandler(&replyHandler);
- connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
[&](const QUrl &url) {
+ connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
+ this, [&](const QUrl &url) {
const QUrlQuery query(url.query());
replyHandler.emitCallbackReceived(QVariantMap {
{ QLatin1String("code"),
QLatin1String("test") },
@@ -241,7 +242,8 @@
oauth2.setAccessTokenUrl(webServer.url(QLatin1String("accessToken")));
ReplyHandler replyHandler;
oauth2.setReplyHandler(&replyHandler);
- connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
[&](const QUrl &url) {
+ connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
+ this, [&](const QUrl &url) {
const QUrlQuery query(url.query());
replyHandler.emitCallbackReceived(QVariantMap {
{ QLatin1String("code"),
QLatin1String("test") },
@@ -476,7 +478,8 @@
oauth2.setAccessTokenUrl(tlsServer.url(QLatin1String("accessToken")));
ReplyHandler replyHandler;
oauth2.setReplyHandler(&replyHandler);
- connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
[&](const QUrl &url) {
+ connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
+ this, [&](const QUrl &url) {
const QUrlQuery query(url.query());
replyHandler.emitCallbackReceived(QVariantMap {
{ QLatin1String("code"),
QLatin1String("test") },
@@ -484,7 +487,7 @@
query.queryItemValue(QLatin1String("state")) }
});
});
- connect(&nam, &QNetworkAccessManager::sslErrors,
+ connect(&nam, &QNetworkAccessManager::sslErrors, this,
[&expectedErrors](QNetworkReply *r, const QList<QSslError> &errors) {
QCOMPARE(errors.size(), 2);
for (const auto &err : errors)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
---
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
2024-03-18 17:52:38.000000000 +0100
+++
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/oauthhttpserverreplyhandler/tst_oauthhttpserverreplyhandler.cpp
2024-03-22 12:24:03.000000000 +0100
@@ -27,7 +27,7 @@
QVERIFY(!callback.isEmpty());
callback.setQuery(query);
QEventLoop eventLoop;
- connect(&replyHandler, &QOAuthHttpServerReplyHandler::callbackReceived,
[&](
+ connect(&replyHandler, &QOAuthHttpServerReplyHandler::callbackReceived,
this, [&](
const QVariantMap ¶meters) {
for (auto item : query.queryItems()) {
QVERIFY(parameters.contains(item.first));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/shared/tlswebserver.h
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/shared/tlswebserver.h
--- old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/shared/tlswebserver.h
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/shared/tlswebserver.h
2024-03-22 12:24:03.000000000 +0100
@@ -34,17 +34,17 @@
QSslServer(parent),
handler(h)
{
- connect(this, &QSslServer::pendingConnectionAvailable, [this]() {
+ connect(this, &QSslServer::pendingConnectionAvailable, this, [this]() {
auto socket = nextPendingConnection();
Q_ASSERT(socket);
auto sslSocket = qobject_cast<QSslSocket *>(socket);
Q_ASSERT(sslSocket);
connect(socket, &QTcpSocket::disconnected, socket,
&QTcpSocket::deleteLater);
- connect(sslSocket, &QSslSocket::sslErrors, [sslSocket](const
QList<QSslError> &errors) {
+ connect(sslSocket, &QSslSocket::sslErrors, this, [sslSocket](const
QList<QSslError> &errors) {
qDebug() << errors;
sslSocket->ignoreSslErrors();
});
- connect(socket, &QTcpSocket::readyRead, [this, socket]() {
+ connect(socket, &QTcpSocket::readyRead, this, [this, socket]() {
if (!clients.contains(socket))
clients[socket].port = serverPort();
@@ -89,7 +89,7 @@
}
});
});
- connect(this, &QSslServer::sslErrors, [this](QSslSocket *s, const
QList<QSslError> &errors) {
+ connect(this, &QSslServer::sslErrors, this, [this](QSslSocket *s, const
QList<QSslError> &errors) {
bool hasOnlyExpectedErrors = true;
for (const auto &err : errors)
hasOnlyExpectedErrors &= expectedSslErrors.contains(err.error());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/shared/webserver.h
new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/shared/webserver.h
--- old/qtnetworkauth-everywhere-src-6.6.3/tests/auto/shared/webserver.h
2024-03-18 17:52:38.000000000 +0100
+++ new/qtnetworkauth-everywhere-src-6.7.0/tests/auto/shared/webserver.h
2024-03-22 12:24:03.000000000 +0100
@@ -7,6 +7,7 @@
#include <functional>
#include <cctype>
#include <QtCore/qcoreapplication.h>
+#include <QtCore/qurl.h>
#include <QtNetwork/qtcpserver.h>
#include <QTcpSocket>
@@ -62,14 +63,14 @@
QMap<QTcpSocket *, HttpRequest> clients;
};
-WebServer::WebServer(Handler handler, QObject *parent) :
+WebServer::WebServer(Handler h, QObject *parent) :
QTcpServer(parent),
- handler(handler)
+ handler(h)
{
- connect(this, &QTcpServer::newConnection, [=]() {
+ connect(this, &QTcpServer::newConnection, this, [this]() {
auto socket = nextPendingConnection();
connect(socket, &QTcpSocket::disconnected, socket,
&QTcpSocket::deleteLater);
- connect(socket, &QTcpSocket::readyRead, [=]() {
+ connect(socket, &QTcpSocket::readyRead, this, [this, socket]() {
if (!clients.contains(socket))
clients[socket].port = serverPort();
