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

QmlDesigner: Remove TextureSpecifics and fix new panes

Browse Source 
MaterialPane now includes MaterialSection and TexturePane includes
TextureSection. Removed those sections from any subtype specifics.

Added hack to ignore specifics for Texture types.

Fixes: QDS-14878
Change-Id: Iffea1be81dc7e12372434cee9135942c7c117082
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Miikka Heikkinen
2025-03-06 16:40:45 +02:00
parent 77455efafa
commit 0c5d7ce4dc
9 changed files with 12 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/CubeMapTextureSpecifics.qml
View File

@@ -1,15 +0,0 @@
// Copyright (C) 2022 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick 2.15
import QtQuick.Layouts 1.15
import HelperWidgets 2.0
Column {
width: parent.width
// CubeMapTexture inherits Texture but doesn't provide any extra properties itself
TextureSection {
width: parent.width
}
}

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/CustomMaterialSpecifics.qml
View File

@@ -11,8 +11,4 @@ Column {
CustomMaterialSection { CustomMaterialSection {
width: parent.width width: parent.width
} }
MaterialSection {
width: parent.width
}
} }

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/DefaultMaterialSpecifics.qml
View File

@@ -11,8 +11,4 @@ Column {
DefaultMaterialSection { DefaultMaterialSection {
width: parent.width width: parent.width
} }
MaterialSection {
width: parent.width
}
} }

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/MaterialPane.qml
View File

@@ -112,6 +112,10 @@ Item {
width: itemPane.width width: itemPane.width
source: specificsUrl source: specificsUrl
} }
MaterialSection {
width: itemPane.width
}
} }
} }

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/PrincipledMaterialSpecifics.qml
View File

@@ -11,8 +11,4 @@ Column {
PrincipledMaterialSection { PrincipledMaterialSection {
width: parent.width width: parent.width
} }
MaterialSection {
width: parent.width
}
} }

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/SpecularGlossyMaterialSpecifics.qml
View File

@@ -11,8 +11,4 @@ Column {
SpecularGlossyMaterialSection { SpecularGlossyMaterialSection {
width: parent.width width: parent.width
} }
MaterialSection {
width: parent.width
}
} }

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TexturePane.qml
View File

@@ -77,6 +77,10 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
source: specificsUrl source: specificsUrl
} }
TextureSection {
width: itemPane.width
}
} }
} }
} }

14
share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick3D/TextureSpecifics.qml
View File

@@ -1,14 +0,0 @@
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick 2.15
import QtQuick.Layouts 1.15
import HelperWidgets 2.0
Column {
width: parent.width
TextureSection {
width: parent.width
}
}

4
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
View File

@@ -607,6 +607,10 @@ void PropertyEditorView::setupQmlBackend()
auto [diffClassMetaInfo, qmlSpecificsFile] = diffType(commonAncestor, specificsClassMetaInfo); auto [diffClassMetaInfo, qmlSpecificsFile] = diffType(commonAncestor, specificsClassMetaInfo);
// Hack to fix Textures in property views in case obsolete specifics are loaded from module
if (qmlFileUrl.toLocalFile().endsWith("TexturePane.qml"))
qmlSpecificsFile = QUrl{};
QString specificQmlData = getSpecificQmlData(commonAncestor, m_selectedNode, diffClassMetaInfo); QString specificQmlData = getSpecificQmlData(commonAncestor, m_selectedNode, diffClassMetaInfo);
PropertyEditorQmlBackend *currentQmlBackend = getQmlBackend(m_qmlBackendHash, PropertyEditorQmlBackend *currentQmlBackend = getQmlBackend(m_qmlBackendHash,