diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:51 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-03-03 03:01:51 +0100 |
| commit | c96ed0b5ed5d868de8fc24b6498d482564bbc1b7 (patch) | |
| tree | 15aa336274ab4ec6d8d0be21a351fd5ce43cdf98 /src/extras/plugins.qmltypes | |
| parent | 89751f0754fba5fcd71824b009fcf4aef911f3f4 (diff) | |
| parent | d286adc5c7c27fdbbb7887f3a77212a49726cede (diff) | |
| download | qtquickcontrols-c96ed0b5ed5d868de8fc24b6498d482564bbc1b7.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I3b9f858168f48c8479e6f394f8b87dda61e0adba
Diffstat (limited to 'src/extras/plugins.qmltypes')
| -rw-r--r-- | src/extras/plugins.qmltypes | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/extras/plugins.qmltypes b/src/extras/plugins.qmltypes index 8bb14246..f16f0b5c 100644 --- a/src/extras/plugins.qmltypes +++ b/src/extras/plugins.qmltypes @@ -76,11 +76,6 @@ Module { Method { name: "redraw" } } Component { - name: "QQuickControlsPrivate1Attached" - prototype: "QObject" - Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } - } - Component { name: "QQuickFlatProgressBar" defaultProperty: "data" prototype: "QQuickPaintedItem" @@ -216,7 +211,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -352,7 +347,7 @@ Module { Property { name: "progress"; type: "double"; isReadonly: true } Signal { name: "activated" } Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } @@ -499,7 +494,7 @@ Module { exportMetaObjectRevisions: [0] isComposite: true defaultProperty: "data" - Property { name: "control"; type: "PieMenu_QMLTYPE_87"; isPointer: true } + Property { name: "control"; type: "PieMenu_QMLTYPE_98"; isPointer: true } Property { name: "styleData"; type: "QObject"; isPointer: true } Property { name: "iconSource"; type: "string"; isReadonly: true } } @@ -553,7 +548,7 @@ Module { isComposite: true defaultProperty: "data" Property { name: "isDefault"; type: "bool" } - Property { name: "menu"; type: "Menu_QMLTYPE_33"; isPointer: true } + Property { name: "menu"; type: "Menu_QMLTYPE_38"; isPointer: true } Property { name: "checkable"; type: "bool" } Property { name: "checked"; type: "bool" } Property { name: "exclusiveGroup"; type: "QQuickExclusiveGroup1"; isPointer: true } |