Merge remote-tracking branch 'origin/5.12' into dev

Conflicts:
	tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp

Change-Id: Ic1dace832ad4b29023d24808b8617b5dcc915eb5

3 files changed, 12 insertions, 12 deletions

diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
index f8fa6e6716..1ac28c473b 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -527,7 +527,7 @@ void tst_QQmlDebugJS::changeBreakpoint()
     QCOMPARE(init(qmlscene, CHANGEBREAKPOINT_QMLFILE), ConnectSuccess);
 
     bool isStopped = false;
-    QObject::connect(m_client, &QV4DebugClient::stopped, this, [&]() { isStopped = true; });
+    QObject::connect(m_client.data(), &QV4DebugClient::stopped, this, [&]() { isStopped = true; });
 
     auto continueDebugging = [&]() {
         m_client->continueDebugging(QV4DebugClient::Continue);
@@ -549,7 +549,7 @@ void tst_QQmlDebugJS::changeBreakpoint()
 
     auto setBreakPoint = [&](int sourceLine, bool enabled) {
         int id = -1;
-        auto connection = QObject::connect(m_client, &QV4DebugClient::result, [&]() {
+        auto connection = QObject::connect(m_client.data(), &QV4DebugClient::result, [&]() {
             id = extractBody().value("breakpoint").toInt();
         });
 
@@ -888,7 +888,7 @@ void tst_QQmlDebugJS::encodeQmlScope()
     bool isStopped = false;
     bool scopesFailed = false;
 
-    QObject::connect(m_client, &QV4DebugClient::failure, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::failure, this, [&]() {
         qWarning() << "received failure" << m_client->response().body;
         scopesFailed = true;
         m_process->stop();
@@ -896,12 +896,12 @@ void tst_QQmlDebugJS::encodeQmlScope()
         isStopped = false;
     });
 
-    QObject::connect(m_client, &QV4DebugClient::stopped, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::stopped, this, [&]() {
         m_client->frame();
         isStopped = true;
     });
 
-    QObject::connect(m_client, &QV4DebugClient::result, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::result, this, [&]() {
         const QV4DebugClient::Response value = m_client->response();
 
         if (value.command == QString("scope")) {
@@ -944,20 +944,20 @@ void tst_QQmlDebugJS::breakOnAnchor()
 
     int breaks = 0;
     bool stopped = false;
-    QObject::connect(m_client, &QV4DebugClient::stopped, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::stopped, this, [&]() {
         stopped = true;
         ++breaks;
         m_client->evaluate("this", 0, -1);
     });
 
-    QObject::connect(m_client, &QV4DebugClient::result, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::result, this, [&]() {
         if (stopped) {
             m_client->continueDebugging(QV4DebugClient::Continue);
             stopped = false;
         }
     });
 
-    QObject::connect(m_client, &QV4DebugClient::failure, this, [&]() {
+    QObject::connect(m_client.data(), &QV4DebugClient::failure, this, [&]() {
         qWarning() << "received failure" << m_client->response().body;
     });
 
diff --git a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
index b4f8f389cf..4c4c514832 100644
--- a/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
+++ b/tests/auto/qml/debugger/qqmlpreview/tst_qqmlpreview.cpp
@@ -101,11 +101,11 @@ QList<QQmlDebugClient *> tst_QQmlPreview::createClients()
 {
     m_client = new QQmlPreviewClient(m_connection);
 
-    QObject::connect(m_client, &QQmlPreviewClient::request, this, &tst_QQmlPreview::serveRequest);
-    QObject::connect(m_client, &QQmlPreviewClient::error, this, [this](const QString &error) {
+    QObject::connect(m_client.data(), &QQmlPreviewClient::request, this, &tst_QQmlPreview::serveRequest);
+    QObject::connect(m_client.data(), &QQmlPreviewClient::error, this, [this](const QString &error) {
         m_serviceErrors.append(error);
     });
-    QObject::connect(m_client, &QQmlPreviewClient::fps,
+    QObject::connect(m_client.data(), &QQmlPreviewClient::fps,
                      this, [this](const QQmlPreviewClient::FpsInfo &info) {
         m_frameStats = info;
     });
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 3337e6d3fd..085eb7b87a 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -468,7 +468,7 @@ QList<QQmlDebugClient *> tst_QQmlProfilerService::createClients()
     m_client.reset(new QQmlProfilerTestClient(m_connection));
     m_client->client->setRecording(m_recordFromStart);
     m_client->client->setFlushInterval(m_flushInterval);
-    QObject::connect(m_client->client, &QQmlProfilerClient::complete,
+    QObject::connect(m_client->client.data(), &QQmlProfilerClient::complete,
                      this, [this](){ m_isComplete = true; });
     return QList<QQmlDebugClient *>({m_client->client});
 }