From 67792feba0bc39cd79d789a45978436b09fd4adf Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 31 Jan 2020 13:37:30 +0100 Subject: 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 --- tests/auto/controls/data/TumblerListView.qml | 3 ++- tests/auto/controls/data/TumblerPathView.qml | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/controls/data/TumblerListView.qml b/tests/auto/controls/data/TumblerListView.qml index affaa6cd..33504f33 100644 --- a/tests/auto/controls/data/TumblerListView.qml +++ b/tests/auto/controls/data/TumblerListView.qml @@ -52,7 +52,8 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 ListView { - anchors.fill: parent + implicitWidth: 60 + implicitHeight: 200 snapMode: ListView.SnapToItem highlightRangeMode: ListView.StrictlyEnforceRange preferredHighlightBegin: height / 2 - (height / parent.visibleItemCount / 2) diff --git a/tests/auto/controls/data/TumblerPathView.qml b/tests/auto/controls/data/TumblerPathView.qml index 8ea86eae..ec0d73ef 100644 --- a/tests/auto/controls/data/TumblerPathView.qml +++ b/tests/auto/controls/data/TumblerPathView.qml @@ -53,6 +53,8 @@ import QtQuick.Controls 2.12 PathView { id: pathView + implicitWidth: 60 + implicitHeight: 200 clip: true pathItemCount: parent.visibleItemCount + 1 preferredHighlightBegin: 0.5 -- cgit v1.2.3