diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
| commit | 7e17fb2ded407cd75643f248d39a21721cfd79f7 (patch) | |
| tree | ce24e8e7a94d5bc74566086b61c4164236e468ad /src/imports/window | |
| parent | f3d40bd0203acda21abfb3c3c71e526646706616 (diff) | |
| parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: Id2e81000bcbd4de18fe22b085fdf5eed42c02516
Diffstat (limited to 'src/imports/window')
| -rw-r--r-- | src/imports/window/plugins.qmltypes | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index d9a9b432a2..5d6cf33f4f 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -104,6 +104,12 @@ Module { "NativeTextRendering": 1 } } + Enum { + name: "NativeObjectType" + values: { + "NativeObjectTexture": 0 + } + } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Property { name: "color"; type: "QColor" } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } |