feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmlpreview: fix crash

Browse Source 
Change-Id: Id1b9d8c070539e8935e2d7492f6a8c2567739e00
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2021-04-16 16:47:29 +02:00
parent a8cf61b745
commit 1f2b0cbf39
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp
View File

@@ -40,9 +40,6 @@ QmlPreviewConnectionManager::QmlPreviewConnectionManager(QObject *parent) :
QmlDebug::QmlDebugConnectionManager(parent) QmlDebug::QmlDebugConnectionManager(parent)
{ {
setTarget(nullptr); setTarget(nullptr);
m_createDebugTranslationClientMethod = [](QmlDebug::QmlDebugConnection *connection) {
return std::make_unique<QmlPreview::QmlDebugTranslationClient>(connection);
};
} }
QmlPreviewConnectionManager::~QmlPreviewConnectionManager() = default; QmlPreviewConnectionManager::~QmlPreviewConnectionManager() = default;

8
src/plugins/qmlpreview/qmlpreviewplugin.cpp
View File

@@ -105,6 +105,13 @@ static void defaultFpsHandler(quint16 frames[8])
Core::MessageManager::writeSilently(QString::fromLatin1("QML preview: %1 fps").arg(frames[0])); 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 class QmlPreviewPluginPrivate : public QObject
{ {
public: public:
@@ -198,6 +205,7 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent)
m_fileLoader = &defaultFileLoader; m_fileLoader = &defaultFileLoader;
m_fileClassifer = &defaultFileClassifier; m_fileClassifer = &defaultFileClassifier;
m_fpsHandler = &defaultFpsHandler; m_fpsHandler = &defaultFpsHandler;
m_createDebugTranslationClientMethod = &defaultCreateDebugTranslationClientMethod;
Core::ActionContainer *menu = Core::ActionManager::actionContainer( Core::ActionContainer *menu = Core::ActionManager::actionContainer(
Constants::M_BUILDPROJECT); Constants::M_BUILDPROJECT);