diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:04:15 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-04 03:04:15 +0200 |
| commit | 6a8e8a64d3473c5ff890c022b738862a704516dc (patch) | |
| tree | 372a297312237515c2bf5e6496c8679dd367010c | |
| parent | 887416f3d8a3c1bb70e928ee5d652e34cbc6ed9c (diff) | |
| parent | 299bbcdb59198910188ebe1abbae1d9868d8ae6d (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I529d632409473eb6ae6ff364079e7eaa361f1400
| -rw-r--r-- | src/imports/sensors/qmlsensor.cpp | 4 | ||||
| -rw-r--r-- | src/imports/sensors/qmlsensorgesture.cpp | 2 | ||||
| -rw-r--r-- | src/sensors/gestures/qsensorgesturerecognizer.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp index 84eea6f7..0389af4a 100644 --- a/src/imports/sensors/qmlsensor.cpp +++ b/src/imports/sensors/qmlsensor.cpp @@ -399,7 +399,8 @@ void QmlSensor::setBufferSize(int bufferSize) /*! \qmlmethod bool Sensor::start() - Start retrieving values from the sensor. Returns true if the sensor was started, false otherwise. + Start retrieving values from the sensor. Returns true if the sensor + was started, false otherwise. Please see QSensor::start() for information. */ @@ -413,6 +414,7 @@ bool QmlSensor::start() /*! \qmlmethod bool Sensor::stop() Stop retrieving values from the sensor. + Returns true if the sensor was stopped, false otherwise. Please see QSensor::stop() for information. */ diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp index d9a51873..2e7f104c 100644 --- a/src/imports/sensors/qmlsensorgesture.cpp +++ b/src/imports/sensors/qmlsensorgesture.cpp @@ -211,7 +211,7 @@ void QmlSensorGesture::setEnabled(bool value) /*! \qmlsignal SensorGesture::detected(string gesture) This signal is emitted whenever a gesture is detected. - The gesture parameter contains the gesture that was detected. + The \a gesture parameter contains the gesture that was detected. The corresponding handler is \c onDetected. */ diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp index baf414e1..9254da28 100644 --- a/src/sensors/gestures/qsensorgesturerecognizer.cpp +++ b/src/sensors/gestures/qsensorgesturerecognizer.cpp @@ -105,7 +105,7 @@ QT_BEGIN_NAMESPACE /*! \fn QSensorGestureRecognizer::detected(const QString &gestureId) - Signals when the \a gestureId gesture has been recognized. + Signals when the gesture with id \a &gestureId been recognized. */ class QSensorGestureRecognizerPrivate |