diff options
author | Kai Koehne <kai.koehne@qt.io> | 2019-02-17 19:39:23 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2019-03-13 20:54:42 +0000 |
commit | f10ac43ebb839b61315bd3b370b77683b625e4c4 (patch) | |
tree | a0e0ea7a1ba5e82730c84ff1eee45e91a7059102 | |
parent | 2b36b81feb76df1a2757d66321fad2d474d7f2fe (diff) |
Update plugins.qmltypes for Qt 5.13
Task-number: QTBUG-73484
Change-Id: I089f5122817a4da1fce13f55d2975240d741b9f6
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r-- | src/imports/builtins/builtins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/folderlistmodel/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/layouts/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/localstorage/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/models/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/particles/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/qtqml/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/qtquick2/plugins.qmltypes | 33 | ||||
-rw-r--r-- | src/imports/settings/plugins.qmltypes | 10 | ||||
-rw-r--r-- | src/imports/shapes/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/sharedimage/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/statemachine/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/imports/testlib/plugins.qmltypes | 23 | ||||
-rw-r--r-- | src/imports/wavefrontmesh/plugins.qmltypes | 4 | ||||
-rw-r--r-- | src/imports/window/plugins.qmltypes | 13 |
15 files changed, 77 insertions, 36 deletions
diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes index f2179aaf7a..4ad103f8de 100644 --- a/src/imports/builtins/builtins.qmltypes +++ b/src/imports/builtins/builtins.qmltypes @@ -1493,10 +1493,10 @@ Module { "WhatsThisRole": 5, "FontRole": 6, "TextAlignmentRole": 7, - "BackgroundColorRole": 8, "BackgroundRole": 8, - "TextColorRole": 9, "ForegroundRole": 9, + "BackgroundColorRole": 8, + "TextColorRole": 9, "CheckStateRole": 10, "AccessibleTextRole": 11, "AccessibleDescriptionRole": 12, diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes index fd92ab9960..6f5466dbda 100644 --- a/src/imports/folderlistmodel/plugins.qmltypes +++ b/src/imports/folderlistmodel/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.12' +// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickFolderListModel" prototype: "QAbstractListModel" diff --git a/src/imports/layouts/plugins.qmltypes b/src/imports/layouts/plugins.qmltypes index f8d7b9acfe..22e8d79ece 100644 --- a/src/imports/layouts/plugins.qmltypes +++ b/src/imports/layouts/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.12' +// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickColumnLayout" defaultProperty: "data" diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes index 59944328d6..3c8c1404f2 100644 --- a/src/imports/localstorage/plugins.qmltypes +++ b/src/imports/localstorage/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 -dependencies dependencies.json QtQuick.LocalStorage 2.12' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.LocalStorage 2.13' Module { dependencies: [] diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes index 87ec0fee76..6e112c41b6 100644 --- a/src/imports/models/plugins.qmltypes +++ b/src/imports/models/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 -dependencies dependencies.json QtQml.Models 2.12' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQml.Models 2.13' Module { dependencies: [] diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes index b68be6c5da..b6db00e683 100644 --- a/src/imports/particles/plugins.qmltypes +++ b/src/imports/particles/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.12' +// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickAgeAffector" defaultProperty: "data" diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes index 1ffe4a78ca..d548a78dd0 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 -noforceqtquick QtQml 2.12' +// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.13' Module { dependencies: [] diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index 035c13a4d3..f006c874da 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/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 -dependencies dependencies.json QtQuick 2.12' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick 2.13' Module { dependencies: [] @@ -1234,10 +1234,11 @@ Module { name: "QQuickBehavior" defaultProperty: "animation" prototype: "QObject" - exports: ["QtQuick/Behavior 2.0"] - exportMetaObjectRevisions: [0] + exports: ["QtQuick/Behavior 2.0", "QtQuick/Behavior 2.13"] + exportMetaObjectRevisions: [0, 13] Property { name: "animation"; type: "QQuickAbstractAnimation"; isPointer: true } Property { name: "enabled"; type: "bool" } + Property { name: "targetValue"; revision: 13; type: "QVariant"; isReadonly: true } } Component { name: "QQuickBorderImage" @@ -2083,9 +2084,10 @@ Module { exports: [ "QtQuick/GridView 2.0", "QtQuick/GridView 2.1", + "QtQuick/GridView 2.13", "QtQuick/GridView 2.7" ] - exportMetaObjectRevisions: [0, 1, 7] + exportMetaObjectRevisions: [0, 1, 13, 7] attachedType: "QQuickGridViewAttached" Enum { name: "Flow" @@ -2495,11 +2497,12 @@ Module { prototype: "QQuickFlickable" exports: [ "QtQuick/ItemView 2.1", + "QtQuick/ItemView 2.13", "QtQuick/ItemView 2.3", "QtQuick/ItemView 2.7" ] isCreatable: false - exportMetaObjectRevisions: [1, 2, 7] + exportMetaObjectRevisions: [1, 13, 2, 7] Enum { name: "LayoutDirection" values: { @@ -2593,6 +2596,12 @@ Module { Parameter { name: "x"; type: "double" } Parameter { name: "y"; type: "double" } } + Method { + name: "itemAtIndex" + revision: 13 + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } Method { name: "positionViewAtBeginning" } Method { name: "positionViewAtEnd" } Method { name: "forceLayout"; revision: 1 } @@ -3340,8 +3349,12 @@ Module { name: "QQuickPathView" defaultProperty: "data" prototype: "QQuickItem" - exports: ["QtQuick/PathView 2.0", "QtQuick/PathView 2.7"] - exportMetaObjectRevisions: [0, 7] + exports: [ + "QtQuick/PathView 2.0", + "QtQuick/PathView 2.13", + "QtQuick/PathView 2.7" + ] + exportMetaObjectRevisions: [0, 13, 7] attachedType: "QQuickPathViewAttached" Enum { name: "HighlightRangeMode" @@ -3428,6 +3441,12 @@ Module { Parameter { name: "x"; type: "double" } Parameter { name: "y"; type: "double" } } + Method { + name: "itemAtIndex" + revision: 13 + type: "QQuickItem*" + Parameter { name: "index"; type: "int" } + } } Component { name: "QQuickPathViewAttached" diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes index 3c9685fe10..bbc5c1cf8f 100644 --- a/src/imports/settings/plugins.qmltypes +++ b/src/imports/settings/plugins.qmltypes @@ -11,13 +11,10 @@ Module { Component { name: "QQmlSettings" prototype: "QObject" - exports: [ - "Qt.labs.settings/Settings 1.0", - "Qt.labs.settings/Settings 1.1" - ] - exportMetaObjectRevisions: [0, 1] + exports: ["Qt.labs.settings/Settings 1.0"] + exportMetaObjectRevisions: [0] Property { name: "category"; type: "string" } - Property { name: "fileName"; revision: 1; type: "string" } + Property { name: "fileName"; type: "string" } Method { name: "value" type: "QVariant" @@ -34,5 +31,6 @@ Module { Parameter { name: "key"; type: "string" } Parameter { name: "value"; type: "QVariant" } } + Method { name: "sync" } } } diff --git a/src/imports/shapes/plugins.qmltypes b/src/imports/shapes/plugins.qmltypes index a851b20ed2..b78c5a1130 100644 --- a/src/imports/shapes/plugins.qmltypes +++ b/src/imports/shapes/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Shapes 1.12' +// 'qmlplugindump -nonrelocatable QtQuick.Shapes 1.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickShape" defaultProperty: "data" diff --git a/src/imports/sharedimage/plugins.qmltypes b/src/imports/sharedimage/plugins.qmltypes index 504186936b..29639e7697 100644 --- a/src/imports/sharedimage/plugins.qmltypes +++ b/src/imports/sharedimage/plugins.qmltypes @@ -7,5 +7,5 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable Qt.labs.sharedimage 1.0' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] } diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes index 001efd3847..f92aeaa080 100644 --- a/src/imports/statemachine/plugins.qmltypes +++ b/src/imports/statemachine/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 -dependencies dependencies.json QtQml.StateMachine 1.12' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQml.StateMachine 1.13' Module { dependencies: [] diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes index e51371d176..1e081d82ff 100644 --- a/src/imports/testlib/plugins.qmltypes +++ b/src/imports/testlib/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 QtTest 1.12' +// 'qmlplugindump -nonrelocatable QtTest 1.13' Module { dependencies: ["QtQuick 2.0", "QtQuick.Window 2.0"] @@ -177,8 +177,12 @@ Module { Component { name: "QuickTestResult" prototype: "QObject" - exports: ["QtTest/TestResult 1.0", "QtTest/TestResult 1.1"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtTest/TestResult 1.0", + "QtTest/TestResult 1.1", + "QtTest/TestResult 1.13" + ] + exportMetaObjectRevisions: [0, 1, 13] Enum { name: "RunMode" values: { @@ -316,6 +320,19 @@ Module { Parameter { name: "parent"; type: "QObject"; isPointer: true } Parameter { name: "objectName"; type: "string" } } + Method { + name: "isPolishScheduled" + revision: 13 + type: "bool" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + } + Method { + name: "waitForItemPolished" + revision: 13 + type: "bool" + Parameter { name: "item"; type: "QQuickItem"; isPointer: true } + Parameter { name: "timeout"; type: "int" } + } } Component { name: "QuickTestUtil" diff --git a/src/imports/wavefrontmesh/plugins.qmltypes b/src/imports/wavefrontmesh/plugins.qmltypes index a0c4e22271..b9dd9e4c46 100644 --- a/src/imports/wavefrontmesh/plugins.qmltypes +++ b/src/imports/wavefrontmesh/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable Qt.labs.wavefrontmesh 1.12' +// 'qmlplugindump -nonrelocatable Qt.labs.wavefrontmesh 1.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QWavefrontMesh" prototype: "QQuickShaderEffectMesh" diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 79fa40dbb2..b5786ed5a6 100644 --- a/src/imports/window/plugins.qmltypes +++ b/src/imports/window/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtQuick.Window 2.12' +// 'qmlplugindump -nonrelocatable QtQuick.Window 2.13' Module { - dependencies: ["QtQuick 2.12"] + dependencies: ["QtQuick 2.0"] Component { name: "QQuickRootItem" defaultProperty: "data" @@ -160,10 +160,11 @@ Module { prototype: "QQuickWindow" exports: [ "QtQuick.Window/Window 2.1", + "QtQuick.Window/Window 2.13", "QtQuick.Window/Window 2.2", "QtQuick.Window/Window 2.3" ] - exportMetaObjectRevisions: [0, 1, 2] + exportMetaObjectRevisions: [0, 13, 1, 2] attachedType: "QQuickWindowAttached" Property { name: "visible"; type: "bool" } Property { name: "visibility"; type: "Visibility" } @@ -215,6 +216,7 @@ Module { Property { name: "visibility"; revision: 1; type: "Visibility" } Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" } Property { name: "opacity"; revision: 1; type: "double" } + Property { name: "transientParent"; revision: 13; type: "QWindow"; isPointer: true } Signal { name: "screenChanged" Parameter { name: "screen"; type: "QScreen"; isPointer: true } @@ -287,6 +289,11 @@ Module { revision: 1 Parameter { name: "opacity"; type: "double" } } + Signal { + name: "transientParentChanged" + revision: 13 + Parameter { name: "transientParent"; type: "QWindow"; isPointer: true } + } Method { name: "requestActivate"; revision: 1 } Method { name: "setVisible" |