From e4ff58731699e1202396f9ef5863f462fa1d9456 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Wed, 25 Sep 2013 14:47:41 +0200 Subject: Doc: Removed QML version from \inqmlmodule and put it in \qmlmodule -QDoc uses \qmlmodule to determine version -QDoc ignores versions in \inqmlmodule but it is better to remove the version to avoid confusion Task-number: QTBUG-32172 Change-Id: Iccab6b3fe201e8f01ddf130cd985bc0482425bf5 Reviewed-by: Alex Blasche Reviewed-by: Bernd Weimer Reviewed-by: Thomas McGuire Reviewed-by: Martin Smith --- src/imports/sensors/qmlaccelerometer.cpp | 4 ++-- src/imports/sensors/qmlaltimeter.cpp | 4 ++-- src/imports/sensors/qmlambientlightsensor.cpp | 4 ++-- src/imports/sensors/qmlambienttemperaturesensor.cpp | 4 ++-- src/imports/sensors/qmlcompass.cpp | 4 ++-- src/imports/sensors/qmlgyroscope.cpp | 4 ++-- src/imports/sensors/qmlholstersensor.cpp | 4 ++-- src/imports/sensors/qmlirproximitysensor.cpp | 4 ++-- src/imports/sensors/qmllightsensor.cpp | 4 ++-- src/imports/sensors/qmlmagnetometer.cpp | 4 ++-- src/imports/sensors/qmlorientationsensor.cpp | 4 ++-- src/imports/sensors/qmlpressuresensor.cpp | 4 ++-- src/imports/sensors/qmlproximitysensor.cpp | 4 ++-- src/imports/sensors/qmlrotationsensor.cpp | 4 ++-- src/imports/sensors/qmlsensor.cpp | 4 ++-- src/imports/sensors/qmlsensorgesture.cpp | 2 +- src/imports/sensors/qmlsensorglobal.cpp | 2 +- src/imports/sensors/qmltapsensor.cpp | 4 ++-- src/imports/sensors/qmltiltsensor.cpp | 4 ++-- src/sensors/doc/src/qtsensors5.qdoc | 2 +- src/sensors/make_sensor.pl | 4 ++-- 21 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp index 6fc82eab..be153eb6 100644 --- a/src/imports/sensors/qmlaccelerometer.cpp +++ b/src/imports/sensors/qmlaccelerometer.cpp @@ -46,7 +46,7 @@ \qmltype Accelerometer \instantiates QmlAccelerometer \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The Accelerometer element reports on linear acceleration @@ -106,7 +106,7 @@ QSensor *QmlAccelerometer::sensor() const \qmltype AccelerometerReading \instantiates QmlAccelerometerReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The AccelerometerReading element holds the most recent Accelerometer reading. diff --git a/src/imports/sensors/qmlaltimeter.cpp b/src/imports/sensors/qmlaltimeter.cpp index abe3f922..317b759e 100644 --- a/src/imports/sensors/qmlaltimeter.cpp +++ b/src/imports/sensors/qmlaltimeter.cpp @@ -45,7 +45,7 @@ \qmltype Altimeter \instantiates QmlAltimeter \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits Sensor \brief The Altimeter element reports on altitude. @@ -82,7 +82,7 @@ QSensor *QmlAltimeter::sensor() const \qmltype AltimeterReading \instantiates QmlAltimeterReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits SensorReading \brief The AltimeterReading element holds the most recent Altimeter reading. diff --git a/src/imports/sensors/qmlambientlightsensor.cpp b/src/imports/sensors/qmlambientlightsensor.cpp index 06dd1d59..32c4261b 100644 --- a/src/imports/sensors/qmlambientlightsensor.cpp +++ b/src/imports/sensors/qmlambientlightsensor.cpp @@ -46,7 +46,7 @@ \qmltype AmbientLightSensor \instantiates QmlAmbientLightSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The AmbientLightSensor element repors on ambient lighting conditions. @@ -83,7 +83,7 @@ QSensor *QmlAmbientLightSensor::sensor() const \qmltype AmbientLightReading \instantiates QmlAmbientLightSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The AmbientLightReading element holds the most AmbientLightSensor reading. diff --git a/src/imports/sensors/qmlambienttemperaturesensor.cpp b/src/imports/sensors/qmlambienttemperaturesensor.cpp index 1190fca6..6128af13 100644 --- a/src/imports/sensors/qmlambienttemperaturesensor.cpp +++ b/src/imports/sensors/qmlambienttemperaturesensor.cpp @@ -45,7 +45,7 @@ \qmltype AmbientTemperatureSensor \instantiates QmlAmbientTemperatureSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits Sensor \brief The AmbientTemperatureSensor element reports on the ambient temperature. @@ -82,7 +82,7 @@ QSensor *QmlAmbientTemperatureSensor::sensor() const \qmltype AmbientTemperatureReading \instantiates QmlAmbientTemperatureReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits SensorReading \brief The AmbientTemperatureReading element holds the most recent temperature reading. diff --git a/src/imports/sensors/qmlcompass.cpp b/src/imports/sensors/qmlcompass.cpp index 4067c412..ce5f4280 100644 --- a/src/imports/sensors/qmlcompass.cpp +++ b/src/imports/sensors/qmlcompass.cpp @@ -46,7 +46,7 @@ \qmltype Compass \instantiates QmlCompass \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The Compass element reports on heading using magnetic north as a reference. @@ -83,7 +83,7 @@ QSensor *QmlCompass::sensor() const \qmltype CompassReading \instantiates QmlCompassReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The CompassReading element holds the most recent Compass reading. diff --git a/src/imports/sensors/qmlgyroscope.cpp b/src/imports/sensors/qmlgyroscope.cpp index f193f437..1e936800 100644 --- a/src/imports/sensors/qmlgyroscope.cpp +++ b/src/imports/sensors/qmlgyroscope.cpp @@ -46,7 +46,7 @@ \qmltype Gyroscope \instantiates QmlGyroscope \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The Gyroscope element reports on rotational acceleration @@ -82,7 +82,7 @@ QSensor *QmlGyroscope::sensor() const \qmltype GyroscopeReading \instantiates QmlGyroscopeReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The GyroscopeReading element holds the most recent Gyroscope reading. diff --git a/src/imports/sensors/qmlholstersensor.cpp b/src/imports/sensors/qmlholstersensor.cpp index d952e81c..b5fd8c8b 100644 --- a/src/imports/sensors/qmlholstersensor.cpp +++ b/src/imports/sensors/qmlholstersensor.cpp @@ -45,7 +45,7 @@ \qmltype HolsterSensor \instantiates QmlHolsterSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits Sensor \brief The HolsterSensor element reports on whether a device is holstered. @@ -82,7 +82,7 @@ QSensor *QmlHolsterSensor::sensor() const \qmltype HolsterReading \instantiates QmlHolsterReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits SensorReading \brief The HolsterReading element holds the most recent HolsterSensor reading. diff --git a/src/imports/sensors/qmlirproximitysensor.cpp b/src/imports/sensors/qmlirproximitysensor.cpp index ca8b0b2d..3263fc6c 100644 --- a/src/imports/sensors/qmlirproximitysensor.cpp +++ b/src/imports/sensors/qmlirproximitysensor.cpp @@ -46,7 +46,7 @@ \qmltype IRProximitySensor \instantiates QmlIRProximitySensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The IRProximitySensor element reports on infra-red reflectance values. @@ -81,7 +81,7 @@ QSensor *QmlIRProximitySensor::sensor() const \qmltype IRProximityReading \instantiates QmlIRProximitySensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The IRProximityReading element holds the most recent IR proximity reading. diff --git a/src/imports/sensors/qmllightsensor.cpp b/src/imports/sensors/qmllightsensor.cpp index 86126a2a..8d12ad42 100644 --- a/src/imports/sensors/qmllightsensor.cpp +++ b/src/imports/sensors/qmllightsensor.cpp @@ -46,7 +46,7 @@ \qmltype LightSensor \instantiates QmlLightSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The LightSensor element reports on light levels using LUX. @@ -97,7 +97,7 @@ qreal QmlLightSensor::fieldOfView() const \qmltype LightReading \instantiates QmlLightSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The LightReading element holds the most recent LightSensor reading. diff --git a/src/imports/sensors/qmlmagnetometer.cpp b/src/imports/sensors/qmlmagnetometer.cpp index 2c531f70..aa1a05d2 100644 --- a/src/imports/sensors/qmlmagnetometer.cpp +++ b/src/imports/sensors/qmlmagnetometer.cpp @@ -46,7 +46,7 @@ \qmltype Magnetometer \instantiates QmlMagnetometer \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The Magnetometer element reports on magnetic field strength @@ -104,7 +104,7 @@ void QmlMagnetometer::setReturnGeoValues(bool geo) \qmltype MagnetometerReading \instantiates QmlMagnetometerReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The MagnetometerReading element holds the most recent Magnetometer reading. diff --git a/src/imports/sensors/qmlorientationsensor.cpp b/src/imports/sensors/qmlorientationsensor.cpp index 371ca699..d0c86dd3 100644 --- a/src/imports/sensors/qmlorientationsensor.cpp +++ b/src/imports/sensors/qmlorientationsensor.cpp @@ -46,7 +46,7 @@ \qmltype OrientationSensor \instantiates QmlOrientationSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The OrientationSensor element reports device orientation. @@ -83,7 +83,7 @@ QSensor *QmlOrientationSensor::sensor() const \qmltype OrientationReading \instantiates QmlOrientationSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The OrientationReading element holds the most recent OrientationSensor reading. diff --git a/src/imports/sensors/qmlpressuresensor.cpp b/src/imports/sensors/qmlpressuresensor.cpp index 8f32b4e0..a9736c4f 100644 --- a/src/imports/sensors/qmlpressuresensor.cpp +++ b/src/imports/sensors/qmlpressuresensor.cpp @@ -45,7 +45,7 @@ \qmltype PressureSensor \instantiates QmlPressureSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits Sensor \brief The PressureSensor element reports on atmospheric pressure values. @@ -82,7 +82,7 @@ QSensor *QmlPressureSensor::sensor() const \qmltype PressureReading \instantiates QmlPressureReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.1 \inherits SensorReading \brief The PressureReading element holds the most recent PressureSensor reading. diff --git a/src/imports/sensors/qmlproximitysensor.cpp b/src/imports/sensors/qmlproximitysensor.cpp index 66e66482..21c92c91 100644 --- a/src/imports/sensors/qmlproximitysensor.cpp +++ b/src/imports/sensors/qmlproximitysensor.cpp @@ -46,7 +46,7 @@ \qmltype ProximitySensor \instantiates QmlProximitySensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The ProximitySensor element reports on object proximity. @@ -83,7 +83,7 @@ QSensor *QmlProximitySensor::sensor() const \qmltype ProximityReading \instantiates QmlProximitySensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The ProximityReading element holds the most recent ProximitySensor reading. diff --git a/src/imports/sensors/qmlrotationsensor.cpp b/src/imports/sensors/qmlrotationsensor.cpp index f1821641..42541487 100644 --- a/src/imports/sensors/qmlrotationsensor.cpp +++ b/src/imports/sensors/qmlrotationsensor.cpp @@ -46,7 +46,7 @@ \qmltype RotationSensor \instantiates QmlRotationSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The RotationSensor element reports on device rotation @@ -102,7 +102,7 @@ void QmlRotationSensor::_update() \qmltype RotationReading \instantiates QmlRotationSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The RotationReading element holds the most recent RotationSensor reading. diff --git a/src/imports/sensors/qmlsensor.cpp b/src/imports/sensors/qmlsensor.cpp index 3d59a72d..b8f049c1 100644 --- a/src/imports/sensors/qmlsensor.cpp +++ b/src/imports/sensors/qmlsensor.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Sensor \instantiates QmlSensor - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \brief The Sensor element serves as a base type for sensors. @@ -500,7 +500,7 @@ void QmlSensor::updateReading() /*! \qmltype SensorReading \instantiates QmlSensorReading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \brief The SensorReading element serves as a base type for sensor readings. diff --git a/src/imports/sensors/qmlsensorgesture.cpp b/src/imports/sensors/qmlsensorgesture.cpp index 92af3f32..29e220d2 100644 --- a/src/imports/sensors/qmlsensorgesture.cpp +++ b/src/imports/sensors/qmlsensorgesture.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype SensorGesture \instantiates QmlSensorGesture - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \brief Provides notifications when sensor-based gestures are detected. diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp index 0acf397e..ea8e44d6 100644 --- a/src/imports/sensors/qmlsensorglobal.cpp +++ b/src/imports/sensors/qmlsensorglobal.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype SensorGlobal \instantiates QmlSensorGlobal - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \brief The SensorGlobal element provides the module API. 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. diff --git a/src/imports/sensors/qmltiltsensor.cpp b/src/imports/sensors/qmltiltsensor.cpp index 08f42312..39ea9516 100644 --- a/src/imports/sensors/qmltiltsensor.cpp +++ b/src/imports/sensors/qmltiltsensor.cpp @@ -49,7 +49,7 @@ QT_END_NAMESPACE \qmltype TiltSensor \instantiates QmlTiltSensor \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits Sensor \brief The TiltSensor element reports tilt events @@ -98,7 +98,7 @@ void QmlTiltSensor::calibrate() \qmltype TiltReading \instantiates QmlTiltSensorReading \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.0 \inherits SensorReading \brief The TiltReading element holds the most recent TiltSensor reading. diff --git a/src/sensors/doc/src/qtsensors5.qdoc b/src/sensors/doc/src/qtsensors5.qdoc index 0be75e8b..19ee4fb3 100644 --- a/src/sensors/doc/src/qtsensors5.qdoc +++ b/src/sensors/doc/src/qtsensors5.qdoc @@ -41,7 +41,7 @@ */ /*! - \qmlmodule QtSensors 5 + \qmlmodule QtSensors 5.0 \title Qt Sensors QML Types \ingroup qmlmodules diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 00afa724..87ae2665 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -153,7 +153,7 @@ if (! -e $qmlsource) { \qmltype '.$no_q_sensor.' \instantiates '.$qmlsensor.' \ingroup qml-sensors_type - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.[INSERT VERSION HERE] \inherits Sensor \brief The '.$no_q_sensor.' element reports on fubbleness. @@ -190,7 +190,7 @@ QSensor *'.$qmlsensor.'::sensor() const \qmltype '.$no_q_reading.' \instantiates '.$qmlreading.' \ingroup qml-sensors_reading - \inqmlmodule QtSensors 5.0 + \inqmlmodule QtSensors \since QtSensors 5.[INSERT VERSION HERE] \inherits SensorReading \brief The '.$no_q_reading.' element holds the most recent '.$no_q_sensor.' reading. -- cgit v1.2.3