diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:41:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-22 08:44:53 +0200 |
| commit | 461a29be564271ef3a6ca1728f5e48ec2d25c08d (patch) | |
| tree | 27e9b0f90bc09e59fd31b2a5052e0c6f7327c467 /src/oauth/qoauthhttpserverreplyhandler.cpp | |
| parent | 095d29d1afe10569ea3c2b4d834bc832b3ebaf9a (diff) | |
| parent | 3d93f6436596e349e43c3798b675af66db71df8a (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/oauth/qabstractoauth.cpp
tests/auto/oauth1/tst_oauth1.cpp
Done-with: Jesus Fernandez<jesus.fernandez@qt.io>
Change-Id: I5be2c6ad2cd00943ee3acafe5b5c693fc4ada03c
Diffstat (limited to 'src/oauth/qoauthhttpserverreplyhandler.cpp')
| -rw-r--r-- | src/oauth/qoauthhttpserverreplyhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/oauth/qoauthhttpserverreplyhandler.cpp b/src/oauth/qoauthhttpserverreplyhandler.cpp index 59bb497..c7254de 100644 --- a/src/oauth/qoauthhttpserverreplyhandler.cpp +++ b/src/oauth/qoauthhttpserverreplyhandler.cpp @@ -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. @@ -53,7 +53,7 @@ QOAuthHttpServerReplyHandlerPrivate::QOAuthHttpServerReplyHandlerPrivate( 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() @@ -68,7 +68,7 @@ void QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected() 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) |