diff options
author | Alan Alpert <aalpert@blackberry.com> | 2014-05-01 14:08:42 -0700 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-06 05:42:20 +0200 |
commit | 18a96e8f4913dd96bcead3ddde99a015737e3a3b (patch) | |
tree | e6e58c7ba4fa03b11aae96b9932e586a094de34b /src/imports/window | |
parent | bef0fd5fe9bdcdfa6eb9f0e14fa096038f391139 (diff) |
Update qmltypes files
Additionally, fixes some revisioning errors which a manual inspection
of the qmltypes files diffs revealed.
-mipmapChanged signal is new
-windowTitleChanged signal is new
-Matrix4x4 made 5.3, but was revisioned for 5.4
Task-number: QTBUG-29806
Change-Id: I4cb8bca6ac6fe8040871734c88aabcd392c1d696
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/imports/window')
-rw-r--r-- | src/imports/window/plugins.qmltypes | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 1e3577acda..f69359b125 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -24,6 +24,7 @@ Module { name: "QQuickScreen" prototype: "QObject" exports: ["QtQuick.Window/Screen 2.0"] + isCreatable: false exportMetaObjectRevisions: [0] attachedType: "QQuickScreenAttached" } @@ -56,6 +57,12 @@ Module { prototype: "QWindow" exports: ["QtQuick.Window/Window 2.0"] exportMetaObjectRevisions: [0] + Enum { + name: "SceneGraphError" + values: { + "ContextNotAvailable": 1 + } + } Property { name: "data"; type: "QObject"; isList: true; isReadonly: true } Property { name: "color"; type: "QColor" } Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true } @@ -67,11 +74,19 @@ Module { isPointer: true } Signal { name: "frameSwapped" } + Signal { + name: "openglContextCreated" + revision: 2 + Parameter { name: "context"; type: "QOpenGLContext"; isPointer: true } + } Signal { name: "sceneGraphInitialized" } Signal { name: "sceneGraphInvalidated" } Signal { name: "beforeSynchronizing" } + Signal { name: "afterSynchronizing"; revision: 2 } Signal { name: "beforeRendering" } Signal { name: "afterRendering" } + Signal { name: "afterAnimating"; revision: 2 } + Signal { name: "sceneGraphAboutToStop"; revision: 2 } Signal { name: "closing" revision: 1 @@ -82,6 +97,12 @@ Module { Parameter { type: "QColor" } } Signal { name: "activeFocusItemChanged"; revision: 1 } + Signal { + name: "sceneGraphError" + revision: 2 + Parameter { name: "error"; type: "QQuickWindow::SceneGraphError" } + Parameter { name: "message"; type: "string" } + } Method { name: "update" } Method { name: "releaseResources" } } @@ -91,6 +112,16 @@ Module { prototype: "QQuickWindow" exports: ["QtQuick.Window/Window 2.1"] exportMetaObjectRevisions: [0] + Property { name: "visible"; type: "bool" } + Property { name: "visibility"; type: "Visibility" } + Signal { + name: "visibleChanged" + Parameter { name: "arg"; type: "bool" } + } + Signal { + name: "visibilityChanged" + Parameter { name: "visibility"; type: "QWindow::Visibility" } + } } Component { name: "QWindow" @@ -135,6 +166,11 @@ Module { Parameter { name: "windowState"; type: "Qt::WindowState" } } Signal { + name: "windowTitleChanged" + revision: 2 + Parameter { name: "title"; type: "string" } + } + Signal { name: "xChanged" Parameter { name: "arg"; type: "int" } } |