aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-11-12 13:11:54 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-14 09:24:55 +0000
commite3948955c961972d34483e7da9c2908f5cb84420 (patch)
tree398aca8c466fef3ad473fbbca406bc29bb826a3b
parentc4f82e59d5e9bd3df37c3f08657beb2aeac53161 (diff)
Update plugins.qmltypes
Change-Id: I4357377c0c9dc1f5935ea9293da3f54f7f289b02 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/imports/folderlistmodel/plugins.qmltypes4
-rw-r--r--src/imports/labsmodels/dependencies.json2
-rw-r--r--src/imports/labsmodels/plugins.qmltypes4
-rw-r--r--src/imports/qtquick2/plugins.qmltypes82
-rw-r--r--src/imports/window/plugins.qmltypes10
5 files changed, 48 insertions, 54 deletions
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index cfa4765116..fd92ab9960 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -16,9 +16,10 @@ Module {
"Qt.labs.folderlistmodel/FolderListModel 2.0",
"Qt.labs.folderlistmodel/FolderListModel 2.1",
"Qt.labs.folderlistmodel/FolderListModel 2.11",
+ "Qt.labs.folderlistmodel/FolderListModel 2.12",
"Qt.labs.folderlistmodel/FolderListModel 2.2"
]
- exportMetaObjectRevisions: [0, 0, 1, 11, 2]
+ exportMetaObjectRevisions: [0, 0, 1, 11, 12, 2]
Enum {
name: "SortField"
values: {
@@ -52,6 +53,7 @@ Module {
Property { name: "caseSensitive"; revision: 2; type: "bool" }
Property { name: "count"; type: "int"; isReadonly: true }
Property { name: "status"; revision: 11; type: "Status"; isReadonly: true }
+ Property { name: "sortCaseSensitive"; revision: 12; type: "bool" }
Signal { name: "rowCountChanged" }
Signal { name: "countChanged"; revision: 1 }
Signal { name: "statusChanged"; revision: 11 }
diff --git a/src/imports/labsmodels/dependencies.json b/src/imports/labsmodels/dependencies.json
new file mode 100644
index 0000000000..0d4f101c7a
--- /dev/null
+++ b/src/imports/labsmodels/dependencies.json
@@ -0,0 +1,2 @@
+[
+]
diff --git a/src/imports/labsmodels/plugins.qmltypes b/src/imports/labsmodels/plugins.qmltypes
index 606b8712da..6272069060 100644
--- a/src/imports/labsmodels/plugins.qmltypes
+++ b/src/imports/labsmodels/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.qmlmodels 1.0'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt.labs.qmlmodels 1.0'
Module {
- dependencies: ["QtQuick 2.12"]
+ dependencies: []
Component {
name: "QQmlAbstractDelegateComponent"
prototype: "QQmlComponent"
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 456db6316e..035c13a4d3 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -922,6 +922,21 @@ Module {
Component {
name: "QQuickAnchors"
prototype: "QObject"
+ Enum {
+ name: "Anchors"
+ values: {
+ "InvalidAnchor": 0,
+ "LeftAnchor": 1,
+ "RightAnchor": 2,
+ "TopAnchor": 4,
+ "BottomAnchor": 8,
+ "HCenterAnchor": 16,
+ "VCenterAnchor": 32,
+ "BaselineAnchor": 64,
+ "Horizontal_Mask": 19,
+ "Vertical_Mask": 108
+ }
+ }
Property { name: "left"; type: "QQuickAnchorLine" }
Property { name: "right"; type: "QQuickAnchorLine" }
Property { name: "horizontalCenter"; type: "QQuickAnchorLine" }
@@ -1688,10 +1703,6 @@ Module {
Signal { name: "synchronousDragChanged"; revision: 12 }
Signal { name: "horizontalOvershootChanged"; revision: 9 }
Signal { name: "verticalOvershootChanged"; revision: 9 }
- Signal { name: "atXEndChanged"; revision: 12 }
- Signal { name: "atYEndChanged"; revision: 12 }
- Signal { name: "atXBeginningChanged"; revision: 12 }
- Signal { name: "atYBeginningChanged"; revision: 12 }
Method {
name: "resizeContent"
Parameter { name: "w"; type: "double" }
@@ -2231,6 +2242,16 @@ Module {
]
exportMetaObjectRevisions: [0, 1, 11, 2, 7]
Enum {
+ name: "Flags"
+ values: {
+ "ItemClipsChildrenToShape": 1,
+ "ItemAcceptsInputMethod": 2,
+ "ItemIsFocusScope": 4,
+ "ItemHasContents": 8,
+ "ItemAcceptsDrops": 16
+ }
+ }
+ Enum {
name: "TransformOrigin"
values: {
"TopLeft": 0,
@@ -3095,6 +3116,12 @@ Module {
"InvertedYFramebufferObject": 2
}
}
+ Enum {
+ name: "PerformanceHints"
+ values: {
+ "FastFBOResizing": 1
+ }
+ }
Property { name: "contentsSize"; type: "QSize" }
Property { name: "fillColor"; type: "QColor" }
Property { name: "contentsScale"; type: "double" }
@@ -3536,19 +3563,6 @@ Module {
isCreatable: false
exportMetaObjectRevisions: [0]
Enum {
- name: "DeviceType"
- values: {
- "UnknownDevice": 0,
- "Mouse": 1,
- "TouchScreen": 2,
- "TouchPad": 4,
- "Puck": 8,
- "Stylus": 16,
- "Airbrush": 32,
- "AllDevices": 32767
- }
- }
- Enum {
name: "DeviceTypes"
values: {
"UnknownDevice": 0,
@@ -3562,17 +3576,6 @@ Module {
}
}
Enum {
- name: "PointerType"
- values: {
- "GenericPointer": 1,
- "Finger": 2,
- "Pen": 4,
- "Eraser": 8,
- "Cursor": 16,
- "AllPointerTypes": 32767
- }
- }
- Enum {
name: "PointerTypes"
values: {
"GenericPointer": 1,
@@ -3584,21 +3587,6 @@ Module {
}
}
Enum {
- name: "CapabilityFlag"
- values: {
- "Position": 1,
- "Area": 2,
- "Pressure": 4,
- "Velocity": 8,
- "MouseEmulation": 64,
- "Scroll": 256,
- "Hover": 512,
- "Rotation": 1024,
- "XTilt": 2048,
- "YTilt": 4096
- }
- }
- Enum {
name: "Capabilities"
values: {
"Position": 1,
@@ -4340,10 +4328,6 @@ Module {
Property { name: "columns"; type: "int"; isReadonly: true }
Property { name: "rowSpacing"; type: "double" }
Property { name: "columnSpacing"; type: "double" }
- Property { name: "topMargin"; type: "double" }
- Property { name: "bottomMargin"; type: "double" }
- Property { name: "leftMargin"; type: "double" }
- Property { name: "rightMargin"; type: "double" }
Property { name: "rowHeightProvider"; type: "QJSValue" }
Property { name: "columnWidthProvider"; type: "QJSValue" }
Property { name: "model"; type: "QVariant" }
@@ -4351,8 +4335,6 @@ Module {
Property { name: "reuseItems"; type: "bool" }
Property { name: "contentWidth"; type: "double" }
Property { name: "contentHeight"; type: "double" }
- Signal { name: "contentWidthOverrideChanged" }
- Signal { name: "contentHeightOverrideChanged" }
Method { name: "forceLayout" }
}
Component {
@@ -4559,12 +4541,10 @@ Module {
Signal { name: "contentSizeChanged" }
Signal {
name: "contentWidthChanged"
- revision: 12
Parameter { name: "contentWidth"; type: "double" }
}
Signal {
name: "contentHeightChanged"
- revision: 12
Parameter { name: "contentHeight"; type: "double" }
}
Signal {
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