From a40192644574daf694f70bbe1661487eb06fef68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Thu, 20 Aug 2020 16:48:57 +0200 Subject: Fix ProgressBar on Windows Also remove the two custom progress bars from the manual test where one has a custom background, and the other has a custom contentItem. If you want to customize a progress bar, you need to provide customizations for both the background and the contentItem. You cannot provide a custom background (or contentItem) alone, since its almost impossible to create a custom background that fits well with the contentItem of all the other possible styles it might be using. Change-Id: I82a87513e73f319bcecbfaed341ac4949f64c3bb Reviewed-by: Richard Moe Gustavsen --- tests/manual/nativestyle/CustomProgressBars.qml | 32 ------------------------- 1 file changed, 32 deletions(-) (limited to 'tests') diff --git a/tests/manual/nativestyle/CustomProgressBars.qml b/tests/manual/nativestyle/CustomProgressBars.qml index c920d243..b7617f92 100644 --- a/tests/manual/nativestyle/CustomProgressBars.qml +++ b/tests/manual/nativestyle/CustomProgressBars.qml @@ -58,38 +58,6 @@ ControlContainer { Row { spacing: container.rowSpacing - ProgressBar { - id: c1 - width: 100 - from: 0 - to: 10 - value: time - indeterminate: false - padding: 5 - background: Rectangle { - implicitWidth: 100 - implicitHeight: 6 - color: "darkgray" - } - } - - ProgressBar { - id: c2 - width: 100 - from: 0 - to: 10 - value: time - indeterminate: false - padding: 5 - contentItem: ProgressBarImpl { - implicitHeight: 6 - implicitWidth: 100 - progress: c2.position - indeterminate: false - color: "lightgreen" - } - } - ProgressBar { id: c3 width: 100 -- cgit v1.2.3