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

QmlDesigner: Fix double creation of DVConnector

Browse Source 
DVConnector is created twice once for the toolbar instance and another
time for the statusbar instance in QML. Fix this by making the
DVConnector a static unique_ptr.

Change-Id: Ib8dc18154bbb7915860d182dd5b66626bc3e60d6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2025-02-07 12:08:29 +01:00
committed by Henning Gründl
parent 43f9c2abbc
commit 14a5675e23
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
View File

@@ -48,6 +48,8 @@
#include <QQmlEngine> #include <QQmlEngine>
#include <memory>
namespace QmlDesigner { namespace QmlDesigner {
static Internal::DesignModeWidget *designModeWidget() static Internal::DesignModeWidget *designModeWidget()
@@ -349,6 +351,10 @@ void ActionSubscriber::setupNotifier()
emit tooltipChanged(); emit tooltipChanged();
} }
#ifdef DVCONNECTOR_ENABLED
static std::unique_ptr<DesignViewer::DVConnector> s_designViewerConnector;
#endif
ToolBarBackend::ToolBarBackend(QObject *parent) ToolBarBackend::ToolBarBackend(QObject *parent)
: QObject(parent) : QObject(parent)
{ {
@@ -929,7 +935,10 @@ QString ToolBarBackend::runManagerError() const
#ifdef DVCONNECTOR_ENABLED #ifdef DVCONNECTOR_ENABLED
DesignViewer::DVConnector *ToolBarBackend::designViewerConnector() DesignViewer::DVConnector *ToolBarBackend::designViewerConnector()
{ {
return &m_designViewerConnector; if (!s_designViewerConnector)
s_designViewerConnector = std::make_unique<DesignViewer::DVConnector>();
return s_designViewerConnector.get();
} }
#endif #endif

3
src/plugins/qmldesigner/components/toolbar/toolbarbackend.h
View File

@@ -232,9 +232,6 @@ private:
QStringList m_openDocuments; QStringList m_openDocuments;
QMetaObject::Connection m_kitConnection; QMetaObject::Connection m_kitConnection;
#ifdef DVCONNECTOR_ENABLED
DesignViewer::DVConnector m_designViewerConnector;
#endif
}; };
} // namespace QmlDesigner } // namespace QmlDesigner