diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/imports/sensors/plugins.qmltypes | 4 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.cpp | 6 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.pro | 5 |
4 files changed, 6 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index f8e11680..a98bcf66 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.4.2 +MODULE_VERSION = 5.5.0 diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 461ca8f1..8a986585 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.1 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -notrelocatable QtSensors 5.4' +// 'qmlplugindump -nonrelocatable QtSensors 5.5' Module { Component { @@ -51,7 +51,7 @@ Module { exports: [ "QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2", - "QtSensors/Altimeter 5.4" + "QtSensors/Altimeter 5.5" ] exportMetaObjectRevisions: [0, 0, 0] } diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index 63aaff0c..2948c6ee 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -208,10 +208,10 @@ public: qmlRegisterType <QmlSensorGesture >(package, major, minor, "SensorGesture"); - // Register the 5.4 interfaces + // Register the 5.5 interfaces // No API changes, just reintroduce existing interfaces for 5.2 - // Implicitly registers 5.3 too - minor = 4; + // Implicitly registers 5.3 & 5.4 too + minor = 5; qmlRegisterType <QmlAltimeter >(package, major, minor, "Altimeter"); } }; diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index 73e9c189..bf33f238 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -1,8 +1,3 @@ -CXX_MODULE = sensors -TARGET = declarative_sensors -TARGETPATH = QtSensors -IMPORT_VERSION = 5.1 # Doesn't matter, as long as it's a valid version?! - QT += qml sensors sensors-private HEADERS += \ |