diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:28 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-09-30 23:10:28 +0200 |
commit | b9342258fdbd90783f035285db14fa4825d717bc (patch) | |
tree | ec24d119da63ef0716573b9e33adf22d59b38d6d /src/imports/sensors/qmltapsensor.cpp | |
parent | 8e0fc2d94f803423f4ad88f7e7ddec3d0d97c01d (diff) | |
parent | e4ff58731699e1202396f9ef5863f462fa1d9456 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I640479e743c2707eff3129e94726989330ea3148
Diffstat (limited to 'src/imports/sensors/qmltapsensor.cpp')
-rw-r--r-- | src/imports/sensors/qmltapsensor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/sensors/qmltapsensor.cpp b/src/imports/sensors/qmltapsensor.cpp index 8877b0b0..266a4f94 100644 --- a/src/imports/sensors/qmltapsensor.cpp +++ b/src/imports/sensors/qmltapsensor.cpp @@ -46,7 +46,7 @@ \qmltype TapSensor \instantiates QmlTapSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The TapSensor element reports tap and double tap events @@ -104,7 +104,7 @@ void QmlTapSensor::setReturnDoubleTapEvents(bool ret) \qmltype TapReading \instantiates QmlTapSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The TapReading element holds the most recent TapSensor reading. |