diff options
Diffstat (limited to 'src/imports/sensors')
-rw-r--r-- | src/imports/sensors/plugins.qmltypes | 7 | ||||
-rw-r--r-- | src/imports/sensors/qmlsensorglobal.cpp | 8 | ||||
-rw-r--r-- | src/imports/sensors/sensors.cpp | 6 |
3 files changed, 13 insertions, 8 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/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp index 510ab238..7b993fe0 100644 --- a/src/imports/sensors/qmlsensorglobal.cpp +++ b/src/imports/sensors/qmlsensorglobal.cpp @@ -78,7 +78,9 @@ QmlSensorGlobal::~QmlSensorGlobal() QStringList QmlSensorGlobal::sensorTypes() const { QStringList ret; - foreach (const QByteArray &type, QSensor::sensorTypes()) + const QList<QByteArray> sensorTypes = QSensor::sensorTypes(); + ret.reserve(sensorTypes.count()); + foreach (const QByteArray &type, sensorTypes) ret << QString::fromLocal8Bit(type); return ret; } @@ -92,7 +94,9 @@ QStringList QmlSensorGlobal::sensorTypes() const QStringList QmlSensorGlobal::sensorsForType(const QString &type) const { QStringList ret; - foreach (const QByteArray &identifier, QSensor::sensorsForType(type.toLocal8Bit())) + const QList<QByteArray> sensors = QSensor::sensorsForType(type.toLocal8Bit()); + ret.reserve(sensors.count()); + foreach (const QByteArray &identifier, sensors) ret << QString::fromLocal8Bit(identifier); return ret; } 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"); } }; |