Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf
	src/core/api/qwebengineurlrequestjob.cpp
	src/core/browser_context_adapter.cpp
	src/core/renderer/user_resource_controller.cpp
	src/core/web_engine_context.cpp
	src/webenginewidgets/api/qwebenginepage.cpp

Change-Id: I5278e5e22e1776d42975fc94d70ff8ca4f81fb9a

1 files changed, 15 insertions, 5 deletions

diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 294cc52b1..6961f3b6d 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -163,20 +163,25 @@ public:
 
 class ReplyingUrlSchemeHandler : public QWebEngineUrlSchemeHandler
 {
-    QBuffer m_buffer;
-    QByteArray m_bufferData;
 public:
     ReplyingUrlSchemeHandler(QObject *parent = nullptr)
         : QWebEngineUrlSchemeHandler(parent)
     {
-        m_buffer.setBuffer(&m_bufferData);
+    }
+    ~ReplyingUrlSchemeHandler()
+    {
     }
 
     void requestStarted(QWebEngineUrlRequestJob *job)
     {
-        m_bufferData = job->requestUrl().toString().toUtf8();
-        job->reply("text/plain;charset=utf-8", &m_buffer);
+        QBuffer *buffer = new QBuffer;
+        buffer->setData(job->requestUrl().toString().toUtf8());
+        connect(buffer, &QIODevice::aboutToClose, buffer, &QObject::deleteLater);
+        m_buffers.append(buffer);
+        job->reply("text/plain;charset=utf-8", buffer);
     }
+
+    QList<QPointer<QBuffer>> m_buffers;
 };
 
 class StreamingIODevice : public QIODevice {
@@ -309,6 +314,11 @@ void tst_QWebEngineProfile::urlSchemeHandlers()
     url = QUrl(QStringLiteral("aviancarrier:inspector.mortensen@politistyrke.dk"));
     QVERIFY(loadSync(&view, url));
     QCOMPARE(toPlainTextSync(view.page()), url.toString());
+
+    // Check that all buffers got deleted
+    QCOMPARE(gopherHandler.m_buffers.count(), 2);
+    for (int i = 0; i < gopherHandler.m_buffers.count(); ++i)
+        QVERIFY(gopherHandler.m_buffers.at(i).isNull());
 }
 
 class FailingUrlSchemeHandler : public QWebEngineUrlSchemeHandler