qmlpreview CLI: enable in-place updates

Send in-place update setting and record confirmed settings.

Pick-to: 6.12
Task-number: QTBUG-146122
Change-Id: Ib743217355f6409f38aa421a59d990b08e8c4111
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 21 insertions, 8 deletions

diff --git a/tools/qmlpreview/qmlpreviewapplication.cpp b/tools/qmlpreview/qmlpreviewapplication.cpp
index 13ef97338b..37a29d60e8 100644
--- a/tools/qmlpreview/qmlpreviewapplication.cpp
+++ b/tools/qmlpreview/qmlpreviewapplication.cpp
@@ -54,9 +54,6 @@ QmlPreviewApplication::QmlPreviewApplication(int &argc, char **argv) :
 {
     m_connection.reset(new QQmlDebugConnection);
     m_qmlPreviewClient.reset(new QQmlPreviewClient(m_connection.data()));
-    QQmlPreviewClient::Settings settings;
-    settings.enableInPlaceUpdates = false;
-    m_qmlPreviewClient->sendConfiguration(settings);
     m_connectTimer.setInterval(1000);
 
     m_loadTimer.setInterval(100);
@@ -67,12 +64,26 @@ QmlPreviewApplication::QmlPreviewApplication(int &argc, char **argv) :
 
     connect(&m_connectTimer, &QTimer::timeout, this, &QmlPreviewApplication::tryToConnect);
     connect(m_connection.data(), &QQmlDebugConnection::connected, &m_connectTimer, &QTimer::stop);
+    connect(m_connection.data(), &QQmlDebugConnection::connected, this, [this]() {
+        QQmlPreviewClient::Settings settings;
+        settings.enableInPlaceUpdates = true;
+        m_qmlPreviewClient->sendConfiguration(settings);
+        const QString status = QString::fromUtf8("Inplace updates configuration: %1")
+                                       .arg(settings.enableInPlaceUpdates ? "enabled" : "disabled");
+        logStatus(status);
+    });
 
-    connect(m_qmlPreviewClient.data(), &QQmlPreviewClient::error,
-            this, &QmlPreviewApplication::logError);
-    connect(m_qmlPreviewClient.data(), &QQmlPreviewClient::request,
-            this, &QmlPreviewApplication::serveRequest);
-
+    connect(m_qmlPreviewClient.data(), &QQmlPreviewClient::error, this,
+            &QmlPreviewApplication::logError);
+    connect(m_qmlPreviewClient.data(), &QQmlPreviewClient::request, this,
+            &QmlPreviewApplication::serveRequest);
+    connect(m_qmlPreviewClient.data(), &QQmlPreviewClient::confirmation, this,
+            [this](const QQmlPreviewClient::Settings &settings) {
+                m_confirmedSettings = settings;
+                const QString status = QString::fromUtf8("Inplace updates setting confirmed as: %1")
+                                       .arg(m_confirmedSettings.enableInPlaceUpdates ? "enabled" : "disabled");
+                logStatus(status);
+            });
     connect(&m_watcher, &QmlPreviewFileSystemWatcher::fileChanged,
             this, &QmlPreviewApplication::sendFile);
     connect(&m_watcher, &QmlPreviewFileSystemWatcher::directoryChanged,
diff --git a/tools/qmlpreview/qmlpreviewapplication.h b/tools/qmlpreview/qmlpreviewapplication.h
index eb9bc45d9e..017974bfcd 100644
--- a/tools/qmlpreview/qmlpreviewapplication.h
+++ b/tools/qmlpreview/qmlpreviewapplication.h
@@ -58,6 +58,8 @@ private:
     QTimer m_loadTimer;
     QTimer m_connectTimer;
     uint m_connectionAttempts;
+
+    QQmlPreviewClient::Settings m_confirmedSettings;
 };
 
 #endif // QMLPREVIEWAPPLICATION_H