diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:42 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:27:42 +0100 |
commit | 27ad61518b47d34733ca18a9ad3da72a691d453d (patch) | |
tree | 14862b1a47360422bed8cb62f57cc0af8705af7f | |
parent | 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e (diff) | |
parent | f528104474dd74e34ea6a01da096e7c31730c01a (diff) | |
download | qtsensors-27ad61518b47d34733ca18a9ad3da72a691d453d.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I5f26c3f31900ece899f9ce9870057eb5638c4b59
-rw-r--r-- | src/imports/sensors/qmlsensorglobal.cpp | 12 | ||||
-rw-r--r-- | src/sensors/doc/src/qtsensors5.qdoc | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp index 3d04356..c2a67e8 100644 --- a/src/imports/sensors/qmlsensorglobal.cpp +++ b/src/imports/sensors/qmlsensorglobal.cpp @@ -43,13 +43,13 @@ QT_BEGIN_NAMESPACE /*! - \qmltype SensorGlobal + \qmltype QmlSensors \instantiates QmlSensorGlobal \inqmlmodule QtSensors \since QtSensors 5.0 - \brief The SensorGlobal element provides the module API. + \brief The QmlSensors singleton provides the module API. - The SensorGlobal element provides the module API. + The QmlSensors singleton provides the module API. This element cannot be directly created. It can only be accessed via a namespace import. @@ -76,7 +76,7 @@ QmlSensorGlobal::~QmlSensorGlobal() } /*! - \qmlmethod list<string> SensorGlobal::sensorTypes() + \qmlmethod list<string> QmlSensors::sensorTypes() Returns a list of the sensor types that have been registered. Please see QSensor::sensorTypes() for information. @@ -92,7 +92,7 @@ QStringList QmlSensorGlobal::sensorTypes() const } /*! - \qmlmethod list<string> SensorGlobal::sensorsForType(type) + \qmlmethod list<string> QmlSensors::sensorsForType(type) Returns a list of the sensor identifiers that have been registered for \a type. Please see QSensor::sensorsForType() for information. @@ -108,7 +108,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const } /*! - \qmlmethod string SensorGlobal::defaultSensorForType(type) + \qmlmethod string QmlSensors::defaultSensorForType(type) Returns the default sensor identifier that has been registered for \a type. Please see QSensor::defaultSensorForType() for information. diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc index aec6dda..688ff06 100644 --- a/src/sensors/doc/src/qtsensors5.qdoc +++ b/src/sensors/doc/src/qtsensors5.qdoc @@ -60,7 +60,7 @@ } \endqml - The documentation for the module API can be found in SensorGlobal. + The documentation for the module API can be found in QmlSensors. \section1 QML Sensor Types |