From d98c282554a83be015af742957580a6bf7dd4c68 Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Thu, 8 Sep 2016 17:32:46 +0200 Subject: Update .qmltypes Update qmltypes for 5.8. For some files the -noforceqtquick option is used; in this way there are no redundand definitions of QtQuick component and no unneded dependencies from QtQuick. Change-Id: Id29683fcd6d15056923867ea65b091f998297fc4 Reviewed-by: Simon Hausmann --- src/imports/qtqml/plugins.qmltypes | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/imports/qtqml') diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes index 864aca1f32..82333627a0 100644 --- a/src/imports/qtqml/plugins.qmltypes +++ b/src/imports/qtqml/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQml 2.2' +// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.3' Module { dependencies: [] @@ -27,12 +27,13 @@ Module { Component { name: "QQmlBind" prototype: "QObject" - exports: ["QtQml/Binding 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQml/Binding 2.0", "QtQml/Binding 2.8"] + exportMetaObjectRevisions: [0, 8] Property { name: "target"; type: "QObject"; isPointer: true } Property { name: "property"; type: "string" } Property { name: "value"; type: "QVariant" } Property { name: "when"; type: "bool" } + Property { name: "delayed"; revision: 8; type: "bool" } } Component { name: "QQmlComponent" @@ -92,10 +93,12 @@ Module { Component { name: "QQmlConnections" prototype: "QObject" - exports: ["QtQml/Connections 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"] + exportMetaObjectRevisions: [0, 1] Property { name: "target"; type: "QObject"; isPointer: true } + Property { name: "enabled"; type: "bool" } Property { name: "ignoreUnknownSignals"; type: "bool" } + Signal { name: "enabledChanged"; revision: 1 } } Component { name: "QQmlInstanceModel" @@ -192,6 +195,13 @@ Module { } } } + Component { + name: "QQmlLoggingCategory" + prototype: "QObject" + exports: ["QtQml/LoggingCategory 2.8"] + exportMetaObjectRevisions: [0] + Property { name: "name"; type: "string" } + } Component { name: "QQmlTimer" prototype: "QObject" @@ -215,6 +225,7 @@ Module { Property { name: "button"; type: "int"; isReadonly: true } Property { name: "buttons"; type: "int"; isReadonly: true } Property { name: "modifiers"; type: "int"; isReadonly: true } + Property { name: "source"; revision: 7; type: "int"; isReadonly: true } Property { name: "wasHeld"; type: "bool"; isReadonly: true } Property { name: "isClick"; type: "bool"; isReadonly: true } Property { name: "accepted"; type: "bool" } -- cgit v1.2.3