diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-08-17 12:02:20 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-11 10:19:46 +0200 |
commit | be4e63b220108a959f1d016403aa95389060630e (patch) | |
tree | aeedb34f815135e4ead5c2e7cb61c289ac5fb83e /doc | |
parent | ceb982907c98d2e71e1d7b84c87b06328c6c391f (diff) | |
download | qtsensors-be4e63b220108a959f1d016403aa95389060630e.tar.gz |
Rename QtMobility.sensors 1.3 to QtSensors 5.0
Change-Id: I2b24533d38db1f8e205de19b67fe0b21625bbf6b
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/examples/cubehouse.qdoc | 4 | ||||
-rw-r--r-- | doc/src/examples/qmlqtsensors.qdoc | 6 | ||||
-rw-r--r-- | doc/src/imports/qtsensors5.qdoc (renamed from doc/src/imports/qtmobilitysensors1.qdoc) | 15 | ||||
-rw-r--r-- | doc/src/porting.qdoc | 8 | ||||
-rw-r--r-- | doc/src/qtsensors.qdoc | 5 |
5 files changed, 18 insertions, 20 deletions
diff --git a/doc/src/examples/cubehouse.qdoc b/doc/src/examples/cubehouse.qdoc index 31bad85..37d5fe2 100644 --- a/doc/src/examples/cubehouse.qdoc +++ b/doc/src/examples/cubehouse.qdoc @@ -33,9 +33,9 @@ \image cubehouse.png \section1 Overview - To write a QML application that will use the QML Accelerometer type from the QtMobility.sensors import you need to to the following steps: + To write a QML application that will use the QML Accelerometer type from the QtSensors import you need to to the following steps: - Import the QtMobility.sensors declarative plugin: + Import the QtSensors declarative plugin: \snippet ../examples/sensors/cubehouse/cubehouse.qml 0 diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc index 4016fc4..ed6c99f 100644 --- a/doc/src/examples/qmlqtsensors.qdoc +++ b/doc/src/examples/qmlqtsensors.qdoc @@ -54,16 +54,16 @@ Reading the data can be done for each sensor type like following: - \l {QtMobility.sensors1::TiltSensor} {TiltSensor} + \l {QtSensors::TiltSensor} {TiltSensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 3 \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 4 - \l {QtMobility.sensors1::AmbientLightSensor} {AmbientLightSensor} + \l {QtSensors::AmbientLightSensor} {AmbientLightSensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 5 - \l {QtMobility.sensors1::ProximitySensor} {ProximitySensor} + \l {QtSensors::ProximitySensor} {ProximitySensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 6 */ diff --git a/doc/src/imports/qtmobilitysensors1.qdoc b/doc/src/imports/qtsensors5.qdoc index e040413..02b5360 100644 --- a/doc/src/imports/qtmobilitysensors1.qdoc +++ b/doc/src/imports/qtsensors5.qdoc @@ -26,23 +26,20 @@ ****************************************************************************/ /*! - \qmlmodule QtMobility.sensors 1.3 - \title QtMobility.sensors 1.x - \brief Legacy QML import for QtSensors + \qmlmodule QtSensors 5.0 + \title Qt Sensors QML API + \brief QML import for QtSensors \section1 Overview - This is the legacy QML import. It exists for compatibility with the QtMobiltiy 1.2 release - and is not recommended for new applications. - - See \l{Qt Sensors} for more information about the Sensors API. + This is the QtSensors QML import. \section1 QML Module API If the module is imported into a namespace, some additional methods become available. \code - import QtMobility.sensors 1.3 as Sensors + import QtSensors 5.0 as Sensors ... Component.onCompleted: { var types = Sensors.sensorTypes(); @@ -56,7 +53,7 @@ These types represent specific types of sensors. - Note that most properties come from the abstract \l{QtMobility.sensors1::Sensor}{Sensor} element. + Note that most properties come from the abstract \l{QtSensors::Sensor}{Sensor} element. \annotatedlist qml-sensors_type diff --git a/doc/src/porting.qdoc b/doc/src/porting.qdoc index 9a3ff71..24e0d7e 100644 --- a/doc/src/porting.qdoc +++ b/doc/src/porting.qdoc @@ -39,8 +39,12 @@ \section1 QML - QtSensors ships with a QML import that is mostly compatible with the QtMobility.sensors import. - See \l {QtMobility.sensors 1.x} for more information. + QtSensors ships with a QML import that is compatible with the QtMobility.sensors import. + The limitations of the QtMobility.sensors import have been fixed and some new properties + may exist so apps may need to be updated if they are using custom properties on their + sensor objects. + + See \l {Qt Sensors QML API} for more information. \section1 C++ diff --git a/doc/src/qtsensors.qdoc b/doc/src/qtsensors.qdoc index 0ab598e..b437da2 100644 --- a/doc/src/qtsensors.qdoc +++ b/doc/src/qtsensors.qdoc @@ -39,7 +39,7 @@ \table \row - \li \l {QtMobility.sensors 1.x}{QML API} + \li \l {Qt Sensors QML API}{QML API} \li Information about the Qt Sensors QML API \row \li \l {Qt Sensors C++ API}{C++ API} @@ -69,9 +69,6 @@ \row \li \l {Porting Applications from QtMobility Sensors to Qt Sensors}{Porting Guide} \li Information about the steps needed to port applications to the Qt Sensors API. - \row - \li \l {QtMobility.sensors 1.x}{Legacy QML API} - \li Information about the legacy QtMobility.sensors QML API \endtable |