aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-09-01 20:15:50 +0200
committerMitch Curtis <mitch.curtis@qt.io>2020-09-07 14:55:43 +0200
commita0a7af8ddb4a026d7a7f6a97bda9b8a0dc7a1393 (patch)
tree8cb5c1c5285db8fbc9beb75a609779e16fac823a /src
parent157bb1c4027cb9887feaad63630a4ee5f2c96ad9 (diff)
Native style: don't use ID's inside the styles
Using ID's violates the rule we have for styles. Change-Id: I923199a62ed2dc3f8563ee9eda593905d8b076f9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/imports/nativestyle/controls/DefaultComboBox.qml6
-rw-r--r--src/imports/nativestyle/controls/DefaultGroupBox.qml5
2 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/nativestyle/controls/DefaultComboBox.qml b/src/imports/nativestyle/controls/DefaultComboBox.qml
index 9d0ed5cf..1205d0b6 100644
--- a/src/imports/nativestyle/controls/DefaultComboBox.qml
+++ b/src/imports/nativestyle/controls/DefaultComboBox.qml
@@ -65,10 +65,8 @@ T.ComboBox {
rightInset: nativeBackground ? background.insets.right : 0
contentItem: T.TextField {
- id: textField
-
- implicitWidth: textField.contentWidth
- implicitHeight: textField.contentHeight
+ implicitWidth: contentWidth
+ implicitHeight: contentHeight
text: control.editable ? control.editText : control.displayText
enabled: control.editable
diff --git a/src/imports/nativestyle/controls/DefaultGroupBox.qml b/src/imports/nativestyle/controls/DefaultGroupBox.qml
index d5265bc0..37d0254d 100644
--- a/src/imports/nativestyle/controls/DefaultGroupBox.qml
+++ b/src/imports/nativestyle/controls/DefaultGroupBox.qml
@@ -59,10 +59,9 @@ T.GroupBox {
: Qt.point(0,0)
x: labelPos.x + background.x
y: labelPos.y + background.y - groupBoxPadding.top
- width: txt.implicitWidth
- height: txt.implicitHeight
+ width: children[0].implicitWidth
+ height: children[0].implicitHeight
Text {
- id: txt
width: parent.width
height: parent.height
text: control.title