diff options
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/examples/qmlqtsensors.qdoc | 6 | ||||
-rw-r--r-- | doc/src/imports/qtsensors5.qdoc | 65 | ||||
-rw-r--r-- | doc/src/porting.qdoc | 17 | ||||
-rw-r--r-- | doc/src/qtsensors.qdoc | 2 |
4 files changed, 6 insertions, 84 deletions
diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc index 01937e03..4016fc44 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 {QtSensors5::TiltSensor} {TiltSensor} + \l {QtMobility.sensors1::TiltSensor} {TiltSensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 3 \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 4 - \l {QtSensors5::AmbientLightSensor} {AmbientLightSensor} + \l {QtMobility.sensors1::AmbientLightSensor} {AmbientLightSensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 5 - \l {QtSensors5::ProximitySensor} {ProximitySensor} + \l {QtMobility.sensors1::ProximitySensor} {ProximitySensor} \snippet ../examples/sensors/qmlqtsensors/qmlqtsensors.qml 6 */ diff --git a/doc/src/imports/qtsensors5.qdoc b/doc/src/imports/qtsensors5.qdoc deleted file mode 100644 index 32c46677..00000000 --- a/doc/src/imports/qtsensors5.qdoc +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \qmlmodule QtSensors 5 - \title Qt Sensors QML API - \brief The QML import for Qt Sensors - - \section1 Overview - - - Mobile devices contains sensor hardware that allow detecting changes in various physical - properties of the device itself or its immediate environment. Examples of device properties - include the angle at which the device is held, whereas environmental properties include for - example the current level of ambient light. - - These properties can be either actual values, such as the tilt angle in - degrees, or approximations, like the enumeration describing brightness in - relative terms using values such as AmbientLightSensor.Dark and AmbientLightSensor.Bright. - - The latter type of value is also based on a natural phenomenon (in the case - of the ambient light sensor, the amount of visible light emitted by a source), but the value - itself is descriptive instead of using any effective unit of measurement, such as lumen. - - The identifying string for this component is \e QtSensors. - Use this in the QML import statement, as such: \e import QtSensors 5.0 - - Qt Sensors QML API provides an easy to use interface to the Qt Sensors API. - It enables the receiving of sensor events and reading current values from the - sensors. - - The emulator supports simulating the Ambient Light, Orientation, Compass and Proximity sensors. - - The \l {Qt Sensors - QML example} contains code for using the the \l TiltSensor, \l AmbientLightSensor - and ProximitySensor types. - - \section1 QML Types - -*/ - - diff --git a/doc/src/porting.qdoc b/doc/src/porting.qdoc index 432734d8..9a3ff716 100644 --- a/doc/src/porting.qdoc +++ b/doc/src/porting.qdoc @@ -39,21 +39,8 @@ \section1 QML - Compatibility for QML applications is provided by shipping the legacy \c QtMobility.sensors - QML import. QML applications should not require any changes to continue operating. - - Applications using the legacy QML import may not be able to trivially port over - to the new QML import because the new QML import does not provide types for - every sensor like the legacy QML import does. - - \table - \row - \li \l {Qt Sensors QML API}{QML API} - \li Information about the Qt Sensors QML API - \row - \li \l {QtMobility.sensors 1.x}{Legacy QML API} - \li Information about the legacy QtMobility.sensors QML API - \endtable + QtSensors ships with a QML import that is mostly compatible with the QtMobility.sensors import. + See \l {QtMobility.sensors 1.x} for more information. \section1 C++ diff --git a/doc/src/qtsensors.qdoc b/doc/src/qtsensors.qdoc index d5f3ce31..0ab598e0 100644 --- a/doc/src/qtsensors.qdoc +++ b/doc/src/qtsensors.qdoc @@ -39,7 +39,7 @@ \table \row - \li \l {Qt Sensors QML API}{QML API} + \li \l {QtMobility.sensors 1.x}{QML API} \li Information about the Qt Sensors QML API \row \li \l {Qt Sensors C++ API}{C++ API} |