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

QmlDesigner: Fix Material/Texture Editors toolbars issues

Browse Source 
Make sure each toolbar's enum is registered under a different URI.

Change-Id: I7613b4018b62188ba3fba5f651d064ada8173066
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2022-11-21 21:10:49 +02:00
parent a04f1590de
commit 6d620429c6
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/materialEditorQmlSources/MaterialEditorToolBar.qml
View File

@@ -5,7 +5,7 @@ import QtQuick 2.15
import QtQuickDesignerTheme 1.0 import QtQuickDesignerTheme 1.0
import HelperWidgets 2.0 import HelperWidgets 2.0
import StudioTheme 1.0 as StudioTheme import StudioTheme 1.0 as StudioTheme
import ToolBarAction 1.0 import MaterialToolBarAction 1.0
Rectangle { Rectangle {
id: root id: root

2
share/qtcreator/qmldesigner/textureEditorQmlSource/TextureEditorToolBar.qml
View File

@@ -5,7 +5,7 @@ import QtQuick 2.15
import QtQuickDesignerTheme 1.0 import QtQuickDesignerTheme 1.0
import HelperWidgets 2.0 import HelperWidgets 2.0
import StudioTheme 1.0 as StudioTheme import StudioTheme 1.0 as StudioTheme
import ToolBarAction 1.0 import TextureToolBarAction 1.0
Rectangle { Rectangle {
id: root id: root

2
src/plugins/qmldesigner/components/materialeditor/materialeditorcontextobject.cpp
View File

@@ -30,7 +30,7 @@ MaterialEditorContextObject::MaterialEditorContextObject(QQmlContext *context, Q
: QObject(parent) : QObject(parent)
, m_qmlContext(context) , m_qmlContext(context)
{ {
qmlRegisterUncreatableType<MaterialEditorContextObject>("ToolBarAction", 1, 0, "ToolBarAction", "Enum type"); qmlRegisterUncreatableType<MaterialEditorContextObject>("MaterialToolBarAction", 1, 0, "ToolBarAction", "Enum type");
} }
QQmlComponent *MaterialEditorContextObject::specificQmlComponent() QQmlComponent *MaterialEditorContextObject::specificQmlComponent()

2
src/plugins/qmldesigner/components/textureeditor/textureeditorcontextobject.cpp
View File

@@ -28,7 +28,7 @@ TextureEditorContextObject::TextureEditorContextObject(QQmlContext *context, QOb
: QObject(parent) : QObject(parent)
, m_qmlContext(context) , m_qmlContext(context)
{ {
qmlRegisterUncreatableType<TextureEditorContextObject>("ToolBarAction", 1, 0, "ToolBarAction", "Enum type"); qmlRegisterUncreatableType<TextureEditorContextObject>("TextureToolBarAction", 1, 0, "ToolBarAction", "Enum type");
} }
QQmlComponent *TextureEditorContextObject::specificQmlComponent() QQmlComponent *TextureEditorContextObject::specificQmlComponent()