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

Modeling: Fix queued connections for Qt 6

Browse Source 
The argument must be registered as a meta type for queued connections.
This also depends on a consistent naming of the type in the signal
arguments (which best is fully qualified).

Fixes: QTCREATORBUG-26760
Task-number: QTCREATORBUG-24098
Change-Id: I83991326f051d592a1665ae8cdb472d8376e74bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Eike Ziller
2022-01-03 12:55:06 +01:00
parent cf5fc98a2c
commit 5a135ba442
7 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/modelinglib/qmt/diagram_controller/diagramcontroller.h
View File

@@ -71,16 +71,16 @@ public:
signals: signals:
void beginResetAllDiagrams(); void beginResetAllDiagrams();
void endResetAllDiagrams(); void endResetAllDiagrams();
void beginResetDiagram(const MDiagram *diagram); void beginResetDiagram(const qmt::MDiagram *diagram);
void endResetDiagram(const MDiagram *diagram); void endResetDiagram(const qmt::MDiagram *diagram);
void beginUpdateElement(int row, const MDiagram *diagram); void beginUpdateElement(int row, const qmt::MDiagram *diagram);
void endUpdateElement(int row, const MDiagram *diagram); void endUpdateElement(int row, const qmt::MDiagram *diagram);
void beginInsertElement(int row, const MDiagram *diagram); void beginInsertElement(int row, const qmt::MDiagram *diagram);
void endInsertElement(int row, const MDiagram *diagram); void endInsertElement(int row, const qmt::MDiagram *diagram);
void beginRemoveElement(int row, const MDiagram *diagram); void beginRemoveElement(int row, const qmt::MDiagram *diagram);
void endRemoveElement(int row, const MDiagram *diagram); void endRemoveElement(int row, const qmt::MDiagram *diagram);
void modified(const MDiagram *diagram); void modified(const qmt::MDiagram *diagram);
void diagramAboutToBeRemoved(const MDiagram *diagram); void diagramAboutToBeRemoved(const qmt::MDiagram *diagram);
public: public:
ModelController *modelController() const { return m_modelController; } ModelController *modelController() const { return m_modelController; }

4
src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.h
View File

@@ -80,8 +80,8 @@ public:
~DiagramSceneModel() override; ~DiagramSceneModel() override;
signals: signals:
void diagramSceneActivated(const MDiagram *diagram); void diagramSceneActivated(const qmt::MDiagram *diagram);
void selectionHasChanged(const MDiagram *diagram); void selectionHasChanged(const qmt::MDiagram *diagram);
void sceneRectChanged(const QRectF &sceneRect); void sceneRectChanged(const QRectF &sceneRect);
public: public:

4
src/libs/modelinglib/qmt/diagram_ui/diagramsmanager.h
View File

@@ -61,8 +61,8 @@ public:
signals: signals:
void someDiagramOpened(bool); void someDiagramOpened(bool);
void diagramActivated(const MDiagram *diagram); void diagramActivated(const qmt::MDiagram *diagram);
void diagramSelectionChanged(const MDiagram *diagram); void diagramSelectionChanged(const qmt::MDiagram *diagram);
public: public:
void setModel(TreeModel *model); void setModel(TreeModel *model);

4
src/libs/modelinglib/qmt/diagram_widgets_ui/diagramsview.h
View File

@@ -50,8 +50,8 @@ public:
~DiagramsView() override; ~DiagramsView() override;
signals: signals:
void currentDiagramChanged(const MDiagram *diagram); void currentDiagramChanged(const qmt::MDiagram *diagram);
void diagramCloseRequested(const MDiagram *diagram); void diagramCloseRequested(const qmt::MDiagram *diagram);
void someDiagramOpened(bool); void someDiagramOpened(bool);
public: public:

4
src/libs/modelinglib/qmt/diagram_widgets_ui/stackeddiagramsview.h
View File

@@ -49,8 +49,8 @@ public:
~StackedDiagramsView() override; ~StackedDiagramsView() override;
signals: signals:
void currentDiagramChanged(const MDiagram *diagram); void currentDiagramChanged(const qmt::MDiagram *diagram);
void diagramCloseRequested(const MDiagram *diagram); void diagramCloseRequested(const qmt::MDiagram *diagram);
void someDiagramOpened(bool); void someDiagramOpened(bool);
public: public:

4
src/libs/modelinglib/qmt/tasks/diagramscenecontroller.h
View File

@@ -72,8 +72,8 @@ public:
~DiagramSceneController() override; ~DiagramSceneController() override;
signals: signals:
void newElementCreated(DElement *element, MDiagram *diagram); void newElementCreated(DElement *element, qmt::MDiagram *diagram);
void elementAdded(DElement *element, MDiagram *diagram); void elementAdded(DElement *element, qmt::MDiagram *diagram);
public: public:
ModelController *modelController() const { return m_modelController; } ModelController *modelController() const { return m_modelController; }

5
src/plugins/modeleditor/modeleditor_plugin.cpp
View File

@@ -34,7 +34,8 @@
#include "uicontroller.h" #include "uicontroller.h"
#include "actionhandler.h" #include "actionhandler.h"
#include "qmt/infrastructure/uid.h" #include <qmt/infrastructure/uid.h>
#include <qmt/model/mdiagram.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
@@ -70,6 +71,8 @@ ModelEditorPlugin::ModelEditorPlugin()
pluginInstance = this; pluginInstance = this;
qRegisterMetaType<QItemSelection>("QItemSelection"); qRegisterMetaType<QItemSelection>("QItemSelection");
qRegisterMetaType<qmt::Uid>("qmt::Uid"); qRegisterMetaType<qmt::Uid>("qmt::Uid");
qRegisterMetaType<qmt::MDiagram *>();
qRegisterMetaType<const qmt::MDiagram *>();
} }
ModelEditorPlugin::~ModelEditorPlugin() ModelEditorPlugin::~ModelEditorPlugin()