diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-18 16:29:14 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-27 10:40:01 +0000 |
| commit | a9aa500a680058d7f2a75f02ad8d72c4b1e49f7c (patch) | |
| tree | ff3ed2134ec7d966736a875f0b08ee74e0524b40 /src/imports/controls/plugins.qmltypes | |
| parent | 0942e5cd6f1e4c8eac45a77c5deece671a6f513b (diff) | |
Add ScrollView
[ChangeLog][Controls][ScrollView] Added ScrollView.
Change-Id: I5d68799f0246e04b519bf6a0ec7bc7e5625f50e7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/imports/controls/plugins.qmltypes')
| -rw-r--r-- | src/imports/controls/plugins.qmltypes | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index c3e01172..affdfb96 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -376,6 +376,14 @@ Module { defaultProperty: "data" } Component { + prototype: "QQuickScrollView" + name: "QtQuick.Controls/ScrollView 2.2" + exports: ["QtQuick.Controls/ScrollView 2.2"] + exportMetaObjectRevisions: [2] + isComposite: true + defaultProperty: "contentData" + } + Component { prototype: "QQuickSlider" name: "QtQuick.Controls/Slider 2.0" exports: ["QtQuick.Controls/Slider 2.0"] @@ -1258,6 +1266,17 @@ Module { Property { name: "vertical"; type: "QQuickScrollIndicator"; isPointer: true } } Component { + name: "QQuickScrollView" + defaultProperty: "contentData" + prototype: "QQuickControl" + exports: ["QtQuick.Templates/ScrollView 2.2"] + exportMetaObjectRevisions: [0] + Property { name: "contentWidth"; type: "double" } + Property { name: "contentHeight"; type: "double" } + Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true } + Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true } + } + Component { name: "QQuickSlider" defaultProperty: "data" prototype: "QQuickControl" |