diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 10:08:50 +0100 |
| commit | e7c316504770ce357b2c73be485cdd8c1da9c4c1 (patch) | |
| tree | b49032420022617396a83da310ebe01b38cda8f9 /src/imports/window | |
| parent | 87265c7ab8743ece92262cd6b79bbba9dddd1fe1 (diff) | |
| parent | e3948955c961972d34483e7da9c2908f5cb84420 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7623438dde316ae1e97802f91991f2e7ccc205a5
Diffstat (limited to 'src/imports/window')
| -rw-r--r-- | src/imports/window/plugins.qmltypes | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 8ecb09968c..79fa40dbb2 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -78,6 +78,16 @@ Module { exports: ["QtQuick.Window/Window 2.0"] exportMetaObjectRevisions: [0] Enum { + name: "CreateTextureOptions" + values: { + "TextureHasAlphaChannel": 1, + "TextureHasMipmaps": 2, + "TextureOwnsGLTexture": 4, + "TextureCanUseAtlas": 8, + "TextureIsOpaque": 16 + } + } + Enum { name: "SceneGraphError" values: { "ContextNotAvailable": 1 |