diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 13:42:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-11 07:21:26 +0000 |
| commit | 0bf6a3f4255c2e082db1f84de19034f05c48ce56 (patch) | |
| tree | 249c285f319ceb85ffe6ac38f5cd7b3808c0009c /src/imports/templates/plugins.qmltypes | |
| parent | 038a0c308a03977d3694e16b31c1cf7c7e1a5611 (diff) | |
Add ComboBox::flat
[ChangeLog][ComboBox] Added a flat property that provides more suitable
looks for using ComboBox in a ToolBar.
Task-number: QTBUG-54935
Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/templates/plugins.qmltypes')
| -rw-r--r-- | src/imports/templates/plugins.qmltypes | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index f32f4664..cbcc1fc7 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -126,11 +126,15 @@ Module { name: "QQuickComboBox" defaultProperty: "data" prototype: "QQuickControl" - exports: ["QtQuick.Templates/ComboBox 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "QtQuick.Templates/ComboBox 2.0", + "QtQuick.Templates/ComboBox 2.1" + ] + exportMetaObjectRevisions: [0, 1] Property { name: "count"; type: "int"; isReadonly: true } Property { name: "model"; type: "QVariant" } Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true } + Property { name: "flat"; revision: 1; type: "bool" } Property { name: "pressed"; type: "bool" } Property { name: "highlightedIndex"; type: "int"; isReadonly: true } Property { name: "currentIndex"; type: "int" } |