aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qmldir
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-09-28 15:42:35 +0200
committerRichard Moe Gustavsen <richard.gustavsen@qt.io>2020-09-29 14:33:52 +0200
commit5b711c1cb719d1147791ce23c43133a29d10a807 (patch)
treecc06b587fa4f7d0d38f3e857b9df75e2823909fd /src/imports/controls/material/qmldir
parentad25ebd08247579754243b09f8fa60b778d9a3aa (diff)
Implement ScrollView.qml in all styles
ScrollView.qml makes use of ScrollBar. While most of the styles override ScrollBar.qml, almost none override ScrollView.qml. This means that the ScrollView in Basic style will be used, and that ScrollView will always use it's own scrollbars, regardless if the overridden style provides another ScrollBar.qml. This patch will override ScrollView.qml for all the internal styles so that the correct scrollbars will be used. Change-Id: I1d9ba17f225a82b2dfaae6caba6ac4519f79a705 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qmldir')
-rw-r--r--src/imports/controls/material/qmldir2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index 82199ec0..3ee29b02 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -26,6 +26,7 @@ ProgressBar 2.0 ProgressBar.qml
RadioButton 2.0 RadioButton.qml
RadioDelegate 2.0 RadioDelegate.qml
RangeSlider 2.0 RangeSlider.qml
+ScrollView 2.0 ScrollView.qml
ScrollBar 2.0 ScrollBar.qml
ScrollIndicator 2.0 ScrollIndicator.qml
Slider 2.0 Slider.qml
@@ -96,6 +97,7 @@ RadioButton 6.0 RadioButton.qml
RadioDelegate 6.0 RadioDelegate.qml
RangeSlider 6.0 RangeSlider.qml
RoundButton 6.0 RoundButton.qml
+ScrollView 6.0 ScrollView.qml
ScrollBar 6.0 ScrollBar.qml
ScrollIndicator 6.0 ScrollIndicator.qml
Slider 6.0 Slider.qml