diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:15 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:36 +0100 |
commit | 0a6b30351a0e80447c2dd683765fc1fe66c1eda2 (patch) | |
tree | 6802cbb320ed999f5110b872c33c4e86a5172fbb /src/sensors | |
parent | 032c1e73ef289e64ee38c77faf26c46c74312043 (diff) | |
parent | a5881f10e0ba6ba283b1215a5342056196661414 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I17dec1cd2d4934710663e5fa97c926a65fe301e5
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/qsensorbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sensors/qsensorbackend.cpp b/src/sensors/qsensorbackend.cpp index c17e6383..57679a55 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -147,7 +147,7 @@ QSensor *QSensorBackend::sensor() const } /*! - \fn QSensorBackend::setReading(T *reading) + \fn QSensorBackend<T>::setReading(T *reading) This function is called to initialize the \a reading classes used for a sensor. |