Loading...

XML

Word

Printable

Details

Type: Bug
Resolution: Fixed
Priority: P1: Critical
Fix Version/s: QDS 3.8
Affects Version/s: Some future release
Component/s: 3D View
Labels:
None

Sprint:
QDS Berlin - 2022 Week 37/38

Description

In
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/432333

there were merge conflicts that were just worked around but commenting out the conflicting parts.

src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

<<<<<<< HEAD
    if (propertyType.isFont() || itemInfo.hasProperty(itemProperty)
        || propertyType.isBasedOn(textInfo, rectangleInfo, imageInfo))
||||||| e4bc08fb21
    if (typeName == "font"
            || itemInfo.hasProperty(itemProperty)
            || textInfo.isSubclassOf(typeName)
            || rectangleInfo.isSubclassOf(typeName)
            || imageInfo.isSubclassOf(typeName))
=======
    if (typeName == "font" || typeName == "Texture" || typeName == "vector4d"
            || itemInfo.hasProperty(itemProperty)
            || textInfo.isSubclassOf(typeName)
            || rectangleInfo.isSubclassOf(typeName)
            || imageInfo.isSubclassOf(typeName))
>>>>>>> origin/8.0

src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

    // TODO: this is from 8.0 branch that doesn't apply anymore:
    //    const bool isModel = isValid && modelNode.isSubclassOf("QtQuick3D.Model");
    const bool isModel = false;

src/plugins/qmldesigner/components/edit3d/edit3dview.cpp

       // TODO: this is from 8.0 branch that doesn't apply anymore:
        //        const bool isModel = modelNode.isSubclassOf("QtQuick3D.Model");
        const bool isModel = false;
        if (m_droppedMaterial.isValid() && modelNode.isValid() && isModel) {
            executeInTransaction(__FUNCTION__, [&] {
                assignMaterialTo3dModel(modelNode, m_droppedMaterial);
            });
        }