From 1f2b0cbf3997b85c1c36c9acf0f29375ba27e815 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Fri, 16 Apr 2021 16:47:29 +0200
Subject: [PATCH] qmlpreview: fix crash

Change-Id: Id1b9d8c070539e8935e2d7492f6a8c2567739e00
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp | 3 ---
 src/plugins/qmlpreview/qmlpreviewplugin.cpp            | 8 ++++++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
index 0087d97f21d..45962fe544a 100644
--- a/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
@@ -40,9 +40,6 @@ QmlPreviewConnectionManager::QmlPreviewConnectionManager(QObject *parent) :
     QmlDebug::QmlDebugConnectionManager(parent)
 {
     setTarget(nullptr);
-    m_createDebugTranslationClientMethod = [](QmlDebug::QmlDebugConnection *connection) {
-        return std::make_unique<QmlPreview::QmlDebugTranslationClient>(connection);
-    };
 }
 
 QmlPreviewConnectionManager::~QmlPreviewConnectionManager() = default;
diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
index 06c3887dbdf..cf22d7d5c64 100644
--- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp
+++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp
@@ -105,6 +105,13 @@ static void defaultFpsHandler(quint16 frames[8])
     Core::MessageManager::writeSilently(QString::fromLatin1("QML preview: %1 fps").arg(frames[0]));
 }
 
+static std::unique_ptr<QmlDebugTranslationClient> defaultCreateDebugTranslationClientMethod(QmlDebug::QmlDebugConnection *connection)
+{
+    auto client = std::make_unique<QmlPreview::QmlDebugTranslationClient>(connection);
+    return client;
+};
+
+
 class QmlPreviewPluginPrivate : public QObject
 {
 public:
@@ -198,6 +205,7 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent)
     m_fileLoader = &defaultFileLoader;
     m_fileClassifer = &defaultFileClassifier;
     m_fpsHandler = &defaultFpsHandler;
+    m_createDebugTranslationClientMethod = &defaultCreateDebugTranslationClientMethod;
 
     Core::ActionContainer *menu = Core::ActionManager::actionContainer(
                 Constants::M_BUILDPROJECT);