summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/input/plugins.qmltypes
diff options
context:
space:
mode:
authorKevin Ottens <kevin.ottens@kdab.com>2016-05-10 12:00:38 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-12 09:40:01 +0000
commit544bc5594524b36b63feece874a4e8742cba9428 (patch)
treec181334c11ac9363cc4704d6f4d8a47587625715 /src/quick3d/imports/input/plugins.qmltypes
parent48208a121e5f41b32c952f43b0b73ec3de3d2218 (diff)
Update QML type info due to Input API changes
Change-Id: Ifbfab3d9ee5946be2a73d57f22fca85b7753f135 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/input/plugins.qmltypes')
-rw-r--r--src/quick3d/imports/input/plugins.qmltypes54
1 files changed, 46 insertions, 8 deletions
diff --git a/src/quick3d/imports/input/plugins.qmltypes b/src/quick3d/imports/input/plugins.qmltypes
index dbb2e8d87..faa8ea944 100644
--- a/src/quick3d/imports/input/plugins.qmltypes
+++ b/src/quick3d/imports/input/plugins.qmltypes
@@ -143,14 +143,14 @@ Module {
exports: ["Qt3D.Input/ActionInput 2.0"]
exportMetaObjectRevisions: [0]
Property { name: "sourceDevice"; type: "Qt3DInput::QAbstractPhysicalDevice"; isPointer: true }
- Property { name: "buttons"; type: "QList<int>" }
+ Property { name: "buttons"; type: "QVector<int>" }
Signal {
name: "sourceDeviceChanged"
Parameter { name: "sourceDevice"; type: "QAbstractPhysicalDevice"; isPointer: true }
}
Signal {
name: "buttonsChanged"
- Parameter { name: "buttons"; type: "QList<int>" }
+ Parameter { name: "buttons"; type: "QVector<int>" }
}
Method {
name: "setSourceDevice"
@@ -158,7 +158,7 @@ Module {
}
Method {
name: "setButtons"
- Parameter { name: "buttons"; type: "QList<int>" }
+ Parameter { name: "buttons"; type: "QVector<int>" }
}
}
Component {
@@ -224,14 +224,24 @@ Module {
exports: ["Qt3D.Input/ButtonAxisInput 2.0"]
exportMetaObjectRevisions: [0]
Property { name: "scale"; type: "float" }
- Property { name: "buttons"; type: "QList<int>" }
+ Property { name: "buttons"; type: "QVector<int>" }
+ Property { name: "acceleration"; type: "float" }
+ Property { name: "deceleration"; type: "float" }
Signal {
name: "scaleChanged"
Parameter { name: "scale"; type: "float" }
}
Signal {
name: "buttonsChanged"
- Parameter { name: "buttons"; type: "QList<int>" }
+ Parameter { name: "buttons"; type: "QVector<int>" }
+ }
+ Signal {
+ name: "accelerationChanged"
+ Parameter { name: "acceleration"; type: "float" }
+ }
+ Signal {
+ name: "decelerationChanged"
+ Parameter { name: "deceleration"; type: "float" }
}
Method {
name: "setScale"
@@ -239,8 +249,21 @@ Module {
}
Method {
name: "setButtons"
- Parameter { name: "buttons"; type: "QList<int>" }
+ Parameter { name: "buttons"; type: "QVector<int>" }
+ }
+ Method {
+ name: "setAcceleration"
+ Parameter { name: "acceleration"; type: "float" }
}
+ Method {
+ name: "setDeceleration"
+ Parameter { name: "deceleration"; type: "float" }
+ }
+ }
+ Component {
+ name: "Qt3DInput::QGamepadInput"
+ prototype: "Qt3DInput::QAbstractPhysicalDevice"
+ Property { name: "deviceId"; type: "int" }
}
Component {
name: "Qt3DInput::QInputChord"
@@ -512,8 +535,23 @@ Module {
Component { name: "Qt3DInput::QLogicalDevice"; prototype: "Qt3DCore::QComponent" }
Component {
name: "Qt3DInput::QMouseDevice"
- prototype: "Qt3DInput::QMouseDevice"
- Property { name: "axisSettings"; type: "Qt3DInput::QAxisSetting"; isList: true; isReadonly: true }
+ prototype: "Qt3DInput::QAbstractPhysicalDevice"
+ Enum {
+ name: "Axis"
+ values: {
+ "X": 0,
+ "Y": 1
+ }
+ }
+ Property { name: "sensitivity"; type: "float" }
+ Signal {
+ name: "sensitivityChanged"
+ Parameter { name: "value"; type: "float" }
+ }
+ Method {
+ name: "setSensitivity"
+ Parameter { name: "value"; type: "float" }
+ }
}
Component {
name: "Qt3DInput::QMouseEvent"