diff --git a/src/controls/Label.qml b/src/controls/Label.qml index 6e01701b880678f3054867440c7058e9671c685e..460e77cec43ee3b2c00bee632812fdd6c96921f1 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -80,7 +80,10 @@ Text { */ id: label - font.pixelSize: 11 color: pal.text - SystemPalette {id:pal} + renderType: Text.NativeRendering + SystemPalette { + id: pal + colorGroup: enabled ? SystemPalette.Active : SystemPalette.Disabled + } } diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml index 7a10597820013748d96202b406e8cfdbb2e4f98d..c191dcd016ab8ff8bd2a949c0ebfb5621b0ae788 100644 --- a/tests/manual/testbench/content/PropertyLayouts.qml +++ b/tests/manual/testbench/content/PropertyLayouts.qml @@ -55,7 +55,7 @@ QtObject { property Component intLayout: RowLayout { spacing: 4 - Text { + Label { text: name + ":" Layout.minimumWidth: 100 } @@ -75,7 +75,7 @@ QtObject { property Component realLayout: RowLayout { spacing: 4 - Text { + Label { text: name + ":" Layout.minimumWidth: 100 } @@ -106,7 +106,7 @@ QtObject { property Component stringLayout: RowLayout { spacing: 4 - Text { + Label { text: name + ":" width: 100 } @@ -125,12 +125,12 @@ QtObject { property Component readonlyLayout: RowLayout { height: 20 - Text { + Label { id: text height: 20 text: name + ":" } - Text { + Label { height: 20 anchors.right: parent.right Layout.horizontalSizePolicy: Layout.Expanding @@ -142,7 +142,7 @@ QtObject { id: enumLayout spacing: 4 height: 20 - Text { + Label { text: name + ":" Layout.minimumWidth: 100 }