QmlDesigner: Rename custom className property to classNamePrivateInternal

This property is used for the class name, but "className" could be also
used by the actual application.

Task-number: QDS-6309
Change-Id: I752fafbcae434a8b2b96646e2473b6fedd93a160
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

5 files changed, 24 insertions, 12 deletions

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
index a55280a040..da7baf018b 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/QtQuick/ItemPane.qml
@@ -99,7 +99,7 @@ PropertyEditorPane {
         anchors.right: parent.right
 
         StudioControls.TabButton {
-            text: backendValues.className.value
+            text: backendValues.__classNamePrivateInternal.value
         }
         StudioControls.TabButton {
             text: qsTr("Layout")
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
index 5d9a121a91..2dae032f37 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/ComponentSection.qml
@@ -56,13 +56,13 @@ Section {
                     anchors.fill: parent
                     anchors.leftMargin: StudioTheme.Values.inputHorizontalPadding
                     anchors.topMargin: StudioTheme.Values.typeLabelVerticalShift
-                    text: backendValues.className.value
+                    text: backendValues.__classNamePrivateInternal.value
                 }
 
                 ToolTipArea {
                     anchors.fill: parent
                     onDoubleClicked: {
-                        typeLineEdit.text = backendValues.className.value
+                        typeLineEdit.text = backendValues.__classNamePrivateInternal.value
                         typeLineEdit.visible = !typeLineEdit.visible
                         typeLineEdit.forceActiveFocus()
                     }
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
index b9c2ce6768..5d6e16670e 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
@@ -421,14 +421,19 @@ void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const Q
         context()->setContextProperty(QLatin1String("modelNodeBackend"), &m_backendModelNode);
 
         // className
-        auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className"))));
+        auto valueObject = qobject_cast<PropertyEditorValue *>(variantToQObject(
+            m_backendValuesPropertyMap.value(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY)));
         if (!valueObject)
             valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
-        valueObject->setName("className");
+        valueObject->setName(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY);
         valueObject->setModelNode(qmlObjectNode.modelNode());
         valueObject->setValue(m_backendModelNode.simplifiedTypeName());
-        QObject::connect(valueObject, &PropertyEditorValue::valueChanged, &backendValuesPropertyMap(), &DesignerPropertyMap::valueChanged);
-        m_backendValuesPropertyMap.insert(QLatin1String("className"), QVariant::fromValue(valueObject));
+        QObject::connect(valueObject,
+                         &PropertyEditorValue::valueChanged,
+                         &backendValuesPropertyMap(),
+                         &DesignerPropertyMap::valueChanged);
+        m_backendValuesPropertyMap.insert(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY,
+                                          QVariant::fromValue(valueObject));
 
         // id
         valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("id"))));
@@ -506,14 +511,19 @@ void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl
     foreach (const PropertyName &propertyName, metaInfo.propertyNames())
         setupPropertyEditorValue(propertyName, propertyEditor, QString::fromUtf8(metaInfo.propertyTypeName(propertyName)));
 
-    auto valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("className"))));
+    auto valueObject = qobject_cast<PropertyEditorValue *>(variantToQObject(
+        m_backendValuesPropertyMap.value(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY)));
     if (!valueObject)
         valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
-    valueObject->setName("className");
+    valueObject->setName(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY);
 
     valueObject->setValue(typeName);
-    QObject::connect(valueObject, &PropertyEditorValue::valueChanged, &backendValuesPropertyMap(), &DesignerPropertyMap::valueChanged);
-    m_backendValuesPropertyMap.insert(QLatin1String("className"), QVariant::fromValue(valueObject));
+    QObject::connect(valueObject,
+                     &PropertyEditorValue::valueChanged,
+                     &backendValuesPropertyMap(),
+                     &DesignerPropertyMap::valueChanged);
+    m_backendValuesPropertyMap.insert(Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY,
+                                      QVariant::fromValue(valueObject));
 
     // id
     valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(QLatin1String("id"))));
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
index 3bdfb903c8..fb5d0c6861 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
@@ -144,7 +144,7 @@ void PropertyEditorView::changeValue(const QString &name)
     if (locked())
         return;
 
-    if (propertyName == "className")
+    if (propertyName == Constants::PROPERTY_EDITOR_CLASSNAME_PROPERTY)
         return;
 
     if (noValidSelection())
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index 1bfdbb8ddb..03c2f42cca 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -107,6 +107,8 @@ const char EVENT_TIMELINE_TIME[] = "Timeline";
 const char EVENT_TRANSITIONEDITOR_TIME[] = "Transition Editor";
 const char EVENT_CURVEDITOR_TIME[] = "Curve Editor";
 
+const char PROPERTY_EDITOR_CLASSNAME_PROPERTY[] = "__classNamePrivateInternal";
+
 namespace Internal {
     enum { debug = 0 };
 }