diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-09-18 10:54:22 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-21 06:56:06 +0000 |
| commit | a1e3001fa4036b80a86828a957aaf05126efa310 (patch) | |
| tree | d9f08f9e17a0b46e09af0fddf0695de26b647bba /src/plugins/qmldesigner/components/componentcore | |
| parent | 75a52875d17b3e436712801276152ee24b30b74a (diff) | |
QmlDesigner: Fix build with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I3d5c7d821402acc13ccd505550afc66a531b13b5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/plugins/qmldesigner/components/componentcore')
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/components/componentcore/designeractionmanager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 254d43f4fd..baa0f6a245 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -199,7 +199,7 @@ void DesignerActionManager::registerAddResourceHandler(const AddResourceHandler m_addResourceHandler.append(handler); } -QHash<TypeName, ModelNodePreviewImageHandler> DesignerActionManager::modelNodePreviewHandlers() const +QMultiHash<TypeName, ModelNodePreviewImageHandler> DesignerActionManager::modelNodePreviewHandlers() const { return m_modelNodePreviewImageHandlers; } diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h index 13d964c866..b76d2faa6a 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h @@ -124,7 +124,7 @@ public: QList<AddResourceHandler> addResourceHandler() const; void registerAddResourceHandler(const AddResourceHandler &handler); - QHash<TypeName, ModelNodePreviewImageHandler> modelNodePreviewHandlers() const; + QMultiHash<TypeName, ModelNodePreviewImageHandler> modelNodePreviewHandlers() const; void registerModelNodePreviewHandler(const ModelNodePreviewImageHandler &handler); bool hasModelNodePreviewHandler(const ModelNode &node) const; ModelNodePreviewImageOperation modelNodePreviewOperation(const ModelNode &node) const; |