diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2020-01-31 13:37:30 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-03-23 14:01:37 +0100 |
commit | 67792feba0bc39cd79d789a45978436b09fd4adf (patch) | |
tree | 5945ae9ce2b7f36b00e729a1e81d44b4ae1be66f /src/imports/controls/material/Dial.qml | |
parent | f37bb43758bc19604743ac1d5fdf8d85236b6470 (diff) |
Fix Qt 6 to-do comments in QML files
Remove what appears to be code for backwards compatibility
in the sizing of certain controls. Removing the code shows
no discernible difference in the appearance of those
controls.
[ChangeLog][Controls][Tumbler] implicitWidth and
implicitHeight must now be provided for Tumbler's contentItem,
as with all other controls.
Change-Id: Id858b6d13bfd81d8f30be57290fb260404652a4c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/imports/controls/material/Dial.qml')
-rw-r--r-- | src/imports/controls/material/Dial.qml | 4 |
1 files changed, 2 insertions, 2 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 |