diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-27 09:45:52 +0200 |
| commit | 0f1f7fb97fd0dd572ad61a0ebaef68c2bba72e57 (patch) | |
| tree | e1f3f1b58aa69904e6bc629e88ed68fca858f83a /src/network/access/qnetworkreplyhttpimpl_p.h | |
| parent | e8c70fb07f01b492b721451c00496f860eb40be0 (diff) | |
| parent | 5bb178c479a247720fbc3fbb7f06a32b725193ac (diff) | |
Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
src/widgets/kernel/qwidget.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetrepaintmanager.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Ifae457d0427be8e2465e474b055722e11b3b1e5c
Diffstat (limited to 'src/network/access/qnetworkreplyhttpimpl_p.h')
| -rw-r--r-- | src/network/access/qnetworkreplyhttpimpl_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index f5f01d0811..ef69ce0653 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -63,7 +63,6 @@ #include <QtNetwork/QNetworkCacheMetaData> #include <private/qhttpnetworkrequest_p.h> -#include <private/qbytedata_p.h> #include <private/qnetworkreply_p.h> #include <QtNetwork/QNetworkProxy> #include <QtNetwork/QNetworkSession> @@ -248,7 +247,6 @@ public: quint64 resumeOffset; qint64 preMigrationDownloaded; - QByteDataBuffer pendingDownloadData; // For signal compression qint64 bytesDownloaded; qint64 bytesBuffered; |