summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qtsensors.pro4
-rw-r--r--src/imports/sensors/plugins.qmltypes50
-rw-r--r--src/imports/sensors/qmldir1
-rw-r--r--src/imports/sensors/sensors.pro2
-rw-r--r--src/imports/sensors2/plugins.qmltypes30
-rw-r--r--src/imports/sensors2/qmldir1
-rw-r--r--src/imports/sensors2/sensors2.pro2
7 files changed, 59 insertions, 31 deletions
diff --git a/qtsensors.pro b/qtsensors.pro
index 7eac9a7a..912823f1 100644
--- a/qtsensors.pro
+++ b/qtsensors.pro
@@ -18,8 +18,8 @@ module_qtsensors_snippets.depends = sub_src
# Commands to rebuild the plugin.qmltypes files for our imports
# Run "make rebuild_qmltypes" after completing a build
-sensors_qmltypes.commands = qmlplugindump QtMobility.sensors 1.3 $$QT.sensors.imports > $$PWD/src/imports/sensors/plugin.qmltypes
-sensors2_qmltypes.commands = qmlplugindump QtSensors 5.0 $$QT.sensors.imports > $$PWD/src/imports/sensors2/plugin.qmltypes
+sensors_qmltypes.commands = qmlplugindump QtMobility.sensors 1.3 $$QT.sensors.imports > $$PWD/src/imports/sensors/plugins.qmltypes
+sensors2_qmltypes.commands = qmlplugindump QtSensors 5.0 $$QT.sensors.imports > $$PWD/src/imports/sensors2/plugins.qmltypes
TYPES = sensors_qmltypes sensors2_qmltypes
rebuild_qmltypes.depends = $$TYPES
QMAKE_EXTRA_TARGETS += rebuild_qmltypes $$TYPES
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 48280914..c708a13e 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump QtMobility.sensors 1.3 /home/lramsay/build/qt50/qtbase/imports'.
Module {
Component {
@@ -21,9 +23,9 @@ Module {
"AccelerometerReading 1.2",
"AccelerometerReading 1.3"
]
- Property { name: "x"; type: "qreal"; isReadonly: true }
- Property { name: "y"; type: "qreal"; isReadonly: true }
- Property { name: "z"; type: "qreal"; isReadonly: true }
+ Property { name: "x"; type: "double"; isReadonly: true }
+ Property { name: "y"; type: "double"; isReadonly: true }
+ Property { name: "z"; type: "double"; isReadonly: true }
}
Component {
name: "QAmbientLightReading"
@@ -68,8 +70,8 @@ Module {
"CompassReading 1.2",
"CompassReading 1.3"
]
- Property { name: "azimuth"; type: "qreal"; isReadonly: true }
- Property { name: "calibrationLevel"; type: "qreal"; isReadonly: true }
+ Property { name: "azimuth"; type: "double"; isReadonly: true }
+ Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
}
Component {
name: "QGyroscope"
@@ -80,15 +82,15 @@ Module {
name: "QGyroscopeReading"
prototype: "QSensorReading"
exports: ["GyroscopeReading 1.2", "GyroscopeReading 1.3"]
- Property { name: "x"; type: "qreal"; isReadonly: true }
- Property { name: "y"; type: "qreal"; isReadonly: true }
- Property { name: "z"; type: "qreal"; isReadonly: true }
+ Property { name: "x"; type: "double"; isReadonly: true }
+ Property { name: "y"; type: "double"; isReadonly: true }
+ Property { name: "z"; type: "double"; isReadonly: true }
}
Component {
name: "QIRProximityReading"
prototype: "QSensorReading"
exports: ["IRProximityReading 1.3"]
- Property { name: "reflectance"; type: "qreal"; isReadonly: true }
+ Property { name: "reflectance"; type: "double"; isReadonly: true }
}
Component {
name: "QIRProximitySensor"
@@ -99,7 +101,7 @@ Module {
name: "QLightReading"
prototype: "QSensorReading"
exports: ["LightReading 1.2", "LightReading 1.3"]
- Property { name: "lux"; type: "qreal"; isReadonly: true }
+ Property { name: "lux"; type: "double"; isReadonly: true }
}
Component {
name: "QLightSensor"
@@ -119,10 +121,10 @@ Module {
"MagnetometerReading 1.2",
"MagnetometerReading 1.3"
]
- Property { name: "x"; type: "qreal"; isReadonly: true }
- Property { name: "y"; type: "qreal"; isReadonly: true }
- Property { name: "z"; type: "qreal"; isReadonly: true }
- Property { name: "calibrationLevel"; type: "qreal"; isReadonly: true }
+ Property { name: "x"; type: "double"; isReadonly: true }
+ Property { name: "y"; type: "double"; isReadonly: true }
+ Property { name: "z"; type: "double"; isReadonly: true }
+ Property { name: "calibrationLevel"; type: "double"; isReadonly: true }
}
Component {
name: "QOrientationReading"
@@ -182,9 +184,9 @@ Module {
"RotationReading 1.2",
"RotationReading 1.3"
]
- Property { name: "x"; type: "qreal"; isReadonly: true }
- Property { name: "y"; type: "qreal"; isReadonly: true }
- Property { name: "z"; type: "qreal"; isReadonly: true }
+ Property { name: "x"; type: "double"; isReadonly: true }
+ Property { name: "y"; type: "double"; isReadonly: true }
+ Property { name: "z"; type: "double"; isReadonly: true }
}
Component {
name: "QRotationSensor"
@@ -206,7 +208,8 @@ Module {
"Buffering": 0,
"AlwaysOn": 1,
"GeoValues": 2,
- "FieldOfView": 3
+ "FieldOfView": 3,
+ "Reserved": 257
}
}
Property { name: "sensorid"; type: "QByteArray" }
@@ -222,13 +225,18 @@ Module {
Property { name: "description"; type: "string"; isReadonly: true }
Property { name: "error"; type: "int"; isReadonly: true }
Property { name: "alwaysOn"; revision: 1; type: "bool" }
+ Signal { name: "busyChanged"; type: "void" }
+ Signal { name: "activeChanged"; type: "void" }
+ Signal { name: "readingChanged"; type: "void" }
Signal {
name: "sensorError"
+ type: "void"
Parameter { name: "error"; type: "int" }
}
- Signal { name: "availableSensorsChanged" }
+ Signal { name: "availableSensorsChanged"; type: "void" }
+ Signal { name: "alwaysOnChanged"; type: "void" }
Method { name: "start"; type: "bool" }
- Method { name: "stop" }
+ Method { name: "stop"; type: "void" }
Method { name: "connectToBackend"; type: "bool" }
Method {
name: "isFeatureSupported"
@@ -244,7 +252,7 @@ Module {
"SensorReading 1.2",
"SensorReading 1.3"
]
- Property { name: "timestamp"; type: "quint64"; isReadonly: true }
+ Property { name: "timestamp"; type: "qulonglong"; isReadonly: true }
}
Component {
name: "QTapReading"
diff --git a/src/imports/sensors/qmldir b/src/imports/sensors/qmldir
index 8629eef1..a84a2d32 100644
--- a/src/imports/sensors/qmldir
+++ b/src/imports/sensors/qmldir
@@ -1,2 +1,3 @@
+module QtMobility.sensors
plugin declarative_sensors
typeinfo plugins.qmltypes
diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro
index 043a4357..d533aa0c 100644
--- a/src/imports/sensors/sensors.pro
+++ b/src/imports/sensors/sensors.pro
@@ -10,4 +10,4 @@ SOURCES += sensors.cpp
load(qml_plugin)
OTHER_FILES += \
- plugin.json
+ plugin.json qmldir plugins.qmltypes
diff --git a/src/imports/sensors2/plugins.qmltypes b/src/imports/sensors2/plugins.qmltypes
index 590bf263..97c9fe37 100644
--- a/src/imports/sensors2/plugins.qmltypes
+++ b/src/imports/sensors2/plugins.qmltypes
@@ -2,6 +2,8 @@ import QtQuick.tooling 1.1
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
+//
+// This file was auto-generated with the command 'qmlplugindump QtSensors 5.0 /home/lramsay/build/qt50/qtbase/imports'.
Module {
Component {
@@ -20,6 +22,7 @@ Module {
}
}
Property { name: "lightLevel"; type: "LightLevel"; isReadonly: true }
+ Signal { name: "lightLevelChanged"; type: "void" }
}
Component {
name: "QSensor2Gesture"
@@ -32,14 +35,21 @@ Module {
Property { name: "enabled"; type: "bool" }
Signal {
name: "detected"
+ type: "void"
Parameter { name: "gesture"; type: "string" }
}
+ Signal { name: "availableGesturesChanged"; type: "void" }
+ Signal { name: "gesturesChanged"; type: "void" }
+ Signal { name: "validGesturesChanged"; type: "void" }
+ Signal { name: "invalidGesturesChanged"; type: "void" }
+ Signal { name: "enabledChanged"; type: "void" }
}
Component {
name: "QSensor2Proximity"
prototype: "qsensor2common"
exports: ["ProximitySensor 5.0"]
Property { name: "near"; type: "bool"; isReadonly: true }
+ Signal { name: "nearChanged"; type: "void" }
}
Component {
name: "QSensor2Tilt"
@@ -60,18 +70,24 @@ Module {
"Fast": 2
}
}
- Property { name: "yRotation"; type: "qreal"; isReadonly: true }
- Property { name: "xRotation"; type: "qreal"; isReadonly: true }
+ Property { name: "yRotation"; type: "double"; isReadonly: true }
+ Property { name: "xRotation"; type: "double"; isReadonly: true }
Property { name: "unit"; type: "Unit" }
Property { name: "speed"; type: "Speed" }
- Property { name: "accuracy"; type: "qreal" }
+ Property { name: "accuracy"; type: "double" }
Property { name: "settings"; type: "QByteArray" }
+ Signal { name: "unitChanged"; type: "void" }
+ Signal { name: "yRotationChanged"; type: "void" }
+ Signal { name: "xRotationChanged"; type: "void" }
+ Signal { name: "speedChanged"; type: "void" }
Signal {
name: "tiltChanged"
- Parameter { name: "deltaX"; type: "qreal" }
- Parameter { name: "deltaY"; type: "qreal" }
+ type: "void"
+ Parameter { name: "deltaX"; type: "double" }
+ Parameter { name: "deltaY"; type: "double" }
}
- Method { name: "calibrate" }
+ Signal { name: "accuracyChanged"; type: "void" }
+ Method { name: "calibrate"; type: "void" }
}
Component {
name: "qsensor2common"
@@ -79,5 +95,7 @@ Module {
exports: ["Sensor 5.0"]
Property { name: "enabled"; type: "bool" }
Property { name: "alwaysOn"; type: "bool" }
+ Signal { name: "enabledChanged"; type: "void" }
+ Signal { name: "alwaysOnChanged"; type: "void" }
}
}
diff --git a/src/imports/sensors2/qmldir b/src/imports/sensors2/qmldir
index d2a2be1f..cfef92b2 100644
--- a/src/imports/sensors2/qmldir
+++ b/src/imports/sensors2/qmldir
@@ -1,2 +1,3 @@
+module QtSensors
plugin declarative_qtsensors5
typeinfo plugins.qmltypes
diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro
index be5060e1..24f3fb93 100644
--- a/src/imports/sensors2/sensors2.pro
+++ b/src/imports/sensors2/sensors2.pro
@@ -19,4 +19,4 @@ HEADERS += qsensor2ambientlight.h \
load(qml_plugin)
OTHER_FILES += \
- plugin.json
+ plugin.json qmldir plugins.qmltypes
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 19:26:40 +0000