aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/Dial.qml4
-rw-r--r--src/imports/controls/material/Tumbler.qml4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml
index 1f80a7fe..706261fc 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/imports/controls/material/Dial.qml
@@ -43,9 +43,9 @@ T.Dial {
id: control
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
- implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6
+ implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6
+ implicitContentHeight + topPadding + bottomPadding)
background: Rectangle {
implicitWidth: 100
diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml
index 30d66c58..973b4a68 100644
--- a/src/imports/controls/material/Tumbler.qml
+++ b/src/imports/controls/material/Tumbler.qml
@@ -44,9 +44,9 @@ T.Tumbler {
id: control
implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
- implicitContentWidth + leftPadding + rightPadding) || 60 // ### remove 60 in Qt 6
+ implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
- implicitContentHeight + topPadding + bottomPadding) || 200 // ### remove 200 in Qt 6
+ implicitContentHeight + topPadding + bottomPadding)
delegate: Text {
text: modelData