summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-08-25 12:58:50 +0200
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-08-25 11:04:36 +0000
commit180f28916e072d7aff8ae02b7aa960ad61182ecd (patch)
tree60a7ac1f9522992c94fb252cca4ae3bb3438594f
parent74963930da7984f170da515fa5022db6a7fa5830 (diff)
Introduce QML Sensors 5.6 version
Change-Id: I9f84dd9595d055f424202fbc65de2198b06ee1f3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
-rw-r--r--src/imports/sensors/plugins.qmltypes7
-rw-r--r--src/imports/sensors/sensors.cpp6
2 files changed, 7 insertions, 6 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes
index 8a986585..746230ba 100644
--- a/src/imports/sensors/plugins.qmltypes
+++ b/src/imports/sensors/plugins.qmltypes
@@ -1,12 +1,13 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtSensors 5.5'
+// 'qmlplugindump -nonrelocatable QtSensors 5.6'
Module {
+ dependencies: []
Component {
name: "QmlAccelerometer"
prototype: "QmlSensor"
@@ -51,7 +52,7 @@ Module {
exports: [
"QtSensors/Altimeter 5.1",
"QtSensors/Altimeter 5.2",
- "QtSensors/Altimeter 5.5"
+ "QtSensors/Altimeter 5.6"
]
exportMetaObjectRevisions: [0, 0, 0]
}
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index e35e5bfe..cd454615 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -209,9 +209,9 @@ public:
qmlRegisterType <QmlSensorGesture >(package, major, minor, "SensorGesture");
// Register the 5.5 interfaces
- // No API changes, just reintroduce existing interfaces for 5.2
- // Implicitly registers 5.3 & 5.4 too
- minor = 5;
+ // No API changes, just reintroduce existing interfaces from 5.2
+ // Implicitly registers 5.3 - 5.5 too
+ minor = 6;
qmlRegisterType <QmlAltimeter >(package, major, minor, "Altimeter");
}
};