Merge branch '5.14' into 5.15

Change-Id: I1230ec3a854c0798fa4f7960642e988b917f431e

1 files changed, 8 insertions, 3 deletions

diff --git a/src/core/net/url_request_custom_job_proxy.cpp b/src/core/net/url_request_custom_job_proxy.cpp
index cd7e173ee..d2df64f2f 100644
--- a/src/core/net/url_request_custom_job_proxy.cpp
+++ b/src/core/net/url_request_custom_job_proxy.cpp
@@ -96,9 +96,14 @@ void URLRequestCustomJobProxy::reply(std::string mimeType, QIODevice *device)
     if (m_client->m_device && !m_client->m_device->isReadable())
         m_client->m_device->open(QIODevice::ReadOnly);
 
-    qint64 size = m_client->m_device ? m_client->m_device->size() : -1;
-    if (size > 0)
-        m_client->notifyExpectedContentSize(size);
+    if (m_client->m_firstBytePosition > 0)
+        m_client->m_device->seek(m_client->m_firstBytePosition);
+
+    qint64 deviceSize = m_client->m_device ? m_client->m_device->size() : -1;
+    qint64 remainingBytes = deviceSize - m_client->m_firstBytePosition;
+    if (remainingBytes > 0)
+        m_client->notifyExpectedContentSize(remainingBytes);
+
     if (m_client->m_device && m_client->m_device->isReadable()) {
         m_started = true;
         m_client->notifyHeadersComplete();