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 /src/sensors | |
| parent | 3f28dbc2f911c5a228a807486a56d4dcd87a0a0e (diff) | |
| parent | f528104474dd74e34ea6a01da096e7c31730c01a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Conflicts:
.qmake.conf
Change-Id: I5f26c3f31900ece899f9ce9870057eb5638c4b59
Diffstat (limited to 'src/sensors')
| -rw-r--r-- | src/sensors/doc/src/qtsensors5.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc index aec6dda6..688ff064 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 |