diff options
author | Liang Qi <liang.qi@qt.io> | 2020-02-13 09:14:09 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 18:31:40 +0100 |
commit | 6b2535ea15cdbdb2355416b604f072fc13ff36b2 (patch) | |
tree | 4bf1560bab77c8b315850c5337ba31a0ea87b5f0 /src/network/access/qnetworkreplyhttpimpl_p.h | |
parent | 54c2cebabdda0280b8443c6947b6fee02445e138 (diff) | |
parent | 67491e2df5357706dbf88ddaf1f030ff095b4528 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/widgets/graphicsview/boxes/scene.h
src/corelib/Qt5CoreMacros.cmake
src/corelib/Qt6CoreMacros.cmake
src/network/ssl/qsslsocket.cpp
src/network/ssl/qsslsocket.h
src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
src/testlib/CMakeLists.txt
src/testlib/.prev_CMakeLists.txt
tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp
Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.
Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl_p.h')
-rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index dec0c4c589..c4de63990b 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -66,7 +66,7 @@ #include <private/qhttpnetworkrequest_p.h> #include <private/qnetworkreply_p.h> #include <QtNetwork/QNetworkProxy> -#include <QtNetwork/QNetworkSession> +#include <QtNetwork/QNetworkSession> // ### Qt6: Remove include #ifndef QT_NO_SSL #include <QtNetwork/QSslConfiguration> @@ -102,7 +102,7 @@ public: Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) Q_PRIVATE_SLOT(d_func(), void _q_transferTimedOut()) -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section Q_PRIVATE_SLOT(d_func(), void _q_networkSessionConnected()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionFailed()) Q_PRIVATE_SLOT(d_func(), void _q_networkSessionStateChanged(QNetworkSession::State)) @@ -162,7 +162,7 @@ signals: class QNetworkReplyHttpImplPrivate: public QNetworkReplyPrivate { -#if QT_CONFIG(bearermanagement) +#if QT_CONFIG(bearermanagement) // ### Qt6: Remove section bool startWaitForSession(QSharedPointer<QNetworkSession> &session); #endif @@ -186,7 +186,7 @@ public: void _q_transferTimedOut(); void setupTransferTimeout(); -#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section void _q_networkSessionConnected(); void _q_networkSessionFailed(); void _q_networkSessionStateChanged(QNetworkSession::State); |