From 18461884e0c86ce6214561a5223220de44485513 Mon Sep 17 00:00:00 2001 From: Ali Kianian Date: Fri, 17 Nov 2023 12:33:03 +0200 Subject: [PATCH] QmlDesigner: Fix the bug for overriding Final property Task-number: QDS-11301 Change-Id: I11a9941a344f7091405bd8e4cd5de10bf66c6c2e Reviewed-by: Thomas Hartmann --- .../collectionEditorQmlSource/CollectionItem.qml | 6 +++--- .../collectionEditorQmlSource/ModelSourceItem.qml | 4 ++-- .../imports/StudioControls/SectionLabel.qml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml index 589a1433965..23d0c7af93b 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml @@ -54,16 +54,16 @@ Item { Text { id: moveTool - property StudioTheme.ControlStyle style: StudioTheme.Values.viewBarButtonStyle + property StudioTheme.ControlStyle textStyle: StudioTheme.Values.viewBarButtonStyle - Layout.preferredWidth: moveTool.style.squareControlSize.width + Layout.preferredWidth: moveTool.textStyle.squareControlSize.width Layout.preferredHeight: nameHolder.height Layout.leftMargin: 12 Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter text: StudioTheme.Constants.dragmarks font.family: StudioTheme.Constants.iconFont.family - font.pixelSize: moveTool.style.baseIconFontSize + font.pixelSize: moveTool.textStyle.baseIconFontSize color: root.textColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter diff --git a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml index 365fc930c5f..d04181fd590 100644 --- a/share/qtcreator/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml +++ b/share/qtcreator/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml @@ -74,9 +74,9 @@ Item { Text { id: expandButton - property StudioTheme.ControlStyle style: StudioTheme.Values.viewBarButtonStyle + property StudioTheme.ControlStyle textStyle: StudioTheme.Values.viewBarButtonStyle - Layout.preferredWidth: expandButton.style.squareControlSize.width + Layout.preferredWidth: expandButton.textStyle.squareControlSize.width Layout.preferredHeight: nameHolder.height Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml index b8586d96213..4e52000e986 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml @@ -9,11 +9,11 @@ import StudioTheme 1.0 as StudioTheme T.Label { id: control - property StudioTheme.ControlStyle style: StudioTheme.Values.controlStyle + property StudioTheme.ControlStyle controlStyle: StudioTheme.Values.controlStyle width: Math.max(Math.min(240, parent.width - 220), 90) - color: control.style.text.idle - font.pixelSize: control.style.baseFontSize + color: control.controlStyle.text.idle + font.pixelSize: control.controlStyle.baseFontSize elide: Text.ElideRight Layout.preferredWidth: width