diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:33 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:33 +0100 |
| commit | af8d1019610a34a09830674edea472a62a76ca6d (patch) | |
| tree | 678d46c056619daa386ba234422c562f0ca041cb | |
| parent | c08e6e8d470ccbf6be845e7b6ce72158812ba623 (diff) | |
| parent | d8eef1687dbd7a39affaedc24f7faef320ef33bd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I26f7bef6fb93bc1ddb00b9af13d9582e1a973f07
| -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 57679a55..bb1a8855 100644 --- a/src/sensors/qsensorbackend.cpp +++ b/src/sensors/qsensorbackend.cpp @@ -147,7 +147,7 @@ QSensor *QSensorBackend::sensor() const } /*! - \fn QSensorBackend<T>::setReading(T *reading) + \fn template <typename T> T *QSensorBackend::setReading(T *reading) This function is called to initialize the \a reading classes used for a sensor. |