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/dialogs/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/dialogs/plugins.qmltypes')
| -rw-r--r-- | src/dialogs/plugins.qmltypes | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/dialogs/plugins.qmltypes b/src/dialogs/plugins.qmltypes index e698dc6c..559bb48a 100644 --- a/src/dialogs/plugins.qmltypes +++ b/src/dialogs/plugins.qmltypes @@ -326,11 +326,6 @@ Module { Property { name: "contentItem"; type: "QQuickItem"; isPointer: true } } Component { - name: "QQuickControlsPrivate1Attached" - prototype: "QObject" - Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true } - } - Component { name: "QQuickDialog1" defaultProperty: "contentItem" prototype: "QQuickAbstractDialog" |