summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorPeter Yard <peter.yard@nokia.com>2012-06-13 14:14:30 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-19 03:40:14 +0200
commit3aebcb96b72c8e2dbfeff078e67af55489c2bac8 (patch)
treeef1adbb87daf4f9ddd8ce1ec095f87cb8c6017f7 /doc/src
parenta42fd9d05a8f8db8a79fc8da920fa917188b8e9b (diff)
Docs: change QML elements to QML types in docs.
Change-Id: I54a9a1972978f1d989d262f137b5890d1feb35e0 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/examples/accelbubble.qdoc6
-rw-r--r--doc/src/examples/cubehouse.qdoc8
-rw-r--r--doc/src/examples/grue.qdoc4
-rw-r--r--doc/src/examples/maze.qdoc6
-rw-r--r--doc/src/examples/qmlqtsensors.qdoc8
-rw-r--r--doc/src/examples/qmlsensorgtestures.qdoc8
-rw-r--r--doc/src/examples/sensor_explorer.qdoc4
-rw-r--r--doc/src/examples/shakeit.qdoc6
-rw-r--r--doc/src/imports/qtmobilitysensors1.qdoc8
-rw-r--r--doc/src/imports/qtsensors5.qdoc4
-rw-r--r--doc/src/porting.qdoc2
11 files changed, 32 insertions, 32 deletions
diff --git a/doc/src/examples/accelbubble.qdoc b/doc/src/examples/accelbubble.qdoc
index 4c97c42d..ea741282 100644
--- a/doc/src/examples/accelbubble.qdoc
+++ b/doc/src/examples/accelbubble.qdoc
@@ -28,17 +28,17 @@
/*!
\example QtSensors/QtSensors_accelbubble
\title Qt Sensors - Accel Bubble
- \brief The AccelBubble example demonstrates the Legacy Accelerometer QML element.
+ \brief The AccelBubble example demonstrates the Legacy Accelerometer QML type.
\ingroup qtsensors-examples
\section1 Overview
- Writing a QML application that uses the Legacy Accelerometer QML sensors element requires the following steps:
+ Writing a QML application that uses the Legacy Accelerometer QML sensors type requires the following steps:
Import the Legacy Sensors Declarative module.
\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml 0
- Add an Accelerometer QML element.
+ Add an Accelerometer QML type.
\snippet ../examples/QtSensors/QtSensors_accelbubble/QtSensors_accelbubble.qml 1
diff --git a/doc/src/examples/cubehouse.qdoc b/doc/src/examples/cubehouse.qdoc
index 278dd865..15e52fac 100644
--- a/doc/src/examples/cubehouse.qdoc
+++ b/doc/src/examples/cubehouse.qdoc
@@ -33,13 +33,13 @@
\image cubehouse.png
\section1 Overview
- To write a QML application that will use the QML Accelerometer element 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 QtMobility.sensors import you need to to the following steps:
Import the QtMobility.sensors declarative plugin:
\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 0
- Add the Accelerometer QML elements into your qml file.
+ Add the Accelerometer QML types into your qml file.
\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 1
@@ -48,11 +48,11 @@
\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 2
Reading out the Accelerometer data can be done by implementing the 'onReadingChanged' slot and
- accessing the 'reading' property from the Accelerometer element:
+ accessing the 'reading' property from the Accelerometer type:
\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 3
- By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer element:
+ By using a timer the view can be rotated using the pitch and roll properties from the Accelerometer type:
\snippet ../examples/QtSensors/QtSensors_cubehouse/QtSensors_cubehouse.qml 4
diff --git a/doc/src/examples/grue.qdoc b/doc/src/examples/grue.qdoc
index 73a67fc1..37a602fe 100644
--- a/doc/src/examples/grue.qdoc
+++ b/doc/src/examples/grue.qdoc
@@ -137,7 +137,7 @@
/*!
\example QtSensors/QtSensors_grue/import
\title Grue Sensor QML Import
- \brief The Grue sensor QML import exports the GrueSensor class as a QML element.
+ \brief The Grue sensor QML import exports the GrueSensor class as a QML type.
This example creates the \e {Grue 1.0} import.
@@ -147,7 +147,7 @@
/*!
\example QtSensors/QtSensors_grue
\title Grue Sensor QML Application
- \brief The Grue sensor QML application demonstrates use of the GrueSensor QML element.
+ \brief The Grue sensor QML application demonstrates use of the GrueSensor QML type.
This is a pure QML application that can be run from Qt Creator or directly using the
\c qmlscene binary. You should install the other projects before trying to run
diff --git a/doc/src/examples/maze.qdoc b/doc/src/examples/maze.qdoc
index d9f561e7..edd7e65e 100644
--- a/doc/src/examples/maze.qdoc
+++ b/doc/src/examples/maze.qdoc
@@ -32,16 +32,16 @@
\image maze.png
\section2 Maze in QML
- \brief The Maze example demonstrates the TiltSensor QML element.
+ \brief The Maze example demonstrates the TiltSensor QML type.
- To write a QML application that will use the TiltSensor QML sensors element you need to do the following steps:
+ To write a QML application that will use the TiltSensor QML sensors type you need to do the following steps:
Import the QtSensors 5.x declarative plugin:
\snippet ../examples/QtSensors/QtSensors_maze/QtSensors_maze.qml 0
- Add the Sensor QML elements into your qml file.
+ Add the Sensor QML types into your qml file.
In this example we use the TiltSensor with values based in degrees and an accuracy of 5 degree:
diff --git a/doc/src/examples/qmlqtsensors.qdoc b/doc/src/examples/qmlqtsensors.qdoc
index 4c509392..1dfe3202 100644
--- a/doc/src/examples/qmlqtsensors.qdoc
+++ b/doc/src/examples/qmlqtsensors.qdoc
@@ -32,22 +32,22 @@
\image qmlqtsensors.png
\section2 Qt Sensors in QML
- \brief The QML QtSensors example demonstrates the QML sensors elements in the QtSensors 5 import.
+ \brief The QtSensors - QML example demonstrates the QML sensors types in the QtSensors 5 import.
- To write a QML application that will use the QML sensors elements in the QtSensors 5 import you need to to the following steps:
+ To write a QML application that will use the QML sensors types in the QtSensors 5 import you need to to the following steps:
Import the QtSensors 5.x declarative plugin:
\snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 0
- Add the Sensor QML elements into your qml file.
+ Add the Sensor QML types into your qml file.
In this example we use the TiltSensor:
\snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 1
- The Tilt-, AmbientLight- and the Proximity QML element sensor have the 'enabled' property in common.
+ The Tilt-, AmbientLight- and the Proximity QML sensor types have the 'enabled' property in common.
To start or stop the sensor set this property to true or false.
\snippet ../examples/QtSensors/QtSensors_qmlqtsensors/QtSensors_qmlqtsensors.qml 2
diff --git a/doc/src/examples/qmlsensorgtestures.qdoc b/doc/src/examples/qmlsensorgtestures.qdoc
index 1da467a8..f655d2eb 100644
--- a/doc/src/examples/qmlsensorgtestures.qdoc
+++ b/doc/src/examples/qmlsensorgtestures.qdoc
@@ -27,10 +27,10 @@
/*!
\example QtSensors/QtSensors_qmlsensorgestures
- \title Qt Sensors - SensorGesture QML Element example
+ \title Qt Sensors - SensorGesture QML Type example
\ingroup qtsensors-examples
- \brief This example demonstrates use of the SensorGesture QML element.
+ \brief This example demonstrates use of the SensorGesture QML type.
\section1 Overview
To write a QML application that will use the gesture plugin you need to to the following steps:
@@ -39,11 +39,11 @@
\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 0
- Add the SensorGesture QML element into your qml file.
+ Add the SensorGesture QML type into your qml file.
\snippet ../examples/QtSensors/QtSensors_qmlsensorgestures/GestureView.qml 1
- Each SensorGesture QML element contains a property called gestures.
+ Each SensorGesture QML type contains a property called gestures.
In this example an alias 'gestureid' for this property is used.
diff --git a/doc/src/examples/sensor_explorer.qdoc b/doc/src/examples/sensor_explorer.qdoc
index 1f8e022c..31eb4748 100644
--- a/doc/src/examples/sensor_explorer.qdoc
+++ b/doc/src/examples/sensor_explorer.qdoc
@@ -51,7 +51,7 @@
qmlscene main.qml
\endcode
- To write a QML application that will use the Explorer QML element you need to do the following steps:
+ To write a QML application that will use the Explorer QML type you need to do the following steps:
Import the Explorer 1.0 declarative plugin:
@@ -83,7 +83,7 @@
\title Sensor Explorer QML Import
\section2 Sensor Explorer Declarative Plugin
- \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML element.
+ \brief The Sensor Explorer QML import exports the QSensorExplorer, QPropertyInfo and the QSensorItem class as a QML type.
This example creates the \e {Explorer 1.0} import.
diff --git a/doc/src/examples/shakeit.qdoc b/doc/src/examples/shakeit.qdoc
index fca2a9dd..05bb28bc 100644
--- a/doc/src/examples/shakeit.qdoc
+++ b/doc/src/examples/shakeit.qdoc
@@ -35,17 +35,17 @@
\brief The sensor gesture example demonstrates the steps for creating a QML application
that uses sensor gestures and the included shake sensor.
- Writing a QML application that uses the Shake QML sensorgestures element requires the following steps:
+ Writing a QML application that uses the Shake QML sensorgestures type requires the following steps:
Import the Sensors Declarative module.
\snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 0
- Add a SensorGesture QML element.
+ Add a SensorGesture QML type.
\snippet ../examples/QtSensors/QtSensors_shakeit/QtSensors_shakeit.qml 1
- In the SensorGesture element, specify which gesture to be used.
+ In the SensorGesture type, specify which gesture to be used.
Note that this can be a comma separated list. Here we are only interested in one
gesture recognizer.
diff --git a/doc/src/imports/qtmobilitysensors1.qdoc b/doc/src/imports/qtmobilitysensors1.qdoc
index b4906ed2..cf4bc869 100644
--- a/doc/src/imports/qtmobilitysensors1.qdoc
+++ b/doc/src/imports/qtmobilitysensors1.qdoc
@@ -57,19 +57,19 @@
\li The QTapSensor::returnDoubleTapEvents property cannot be used because QML cannot access dynamic properties.
\endlist
- \section1 QML Sensor Elements
+ \section1 QML Sensor types
- These elements represent specific types of sensors.
+ These types represent specific types of sensors.
\annotatedlist qml-sensors_type
- \section1 QML Reading Elements
+ \section1 QML Reading Types
The data from a sensor comes through a reading class.
\annotatedlist qml-sensors_reading
- \section1 Alphabetical Listing of QML Elements
+ \section1 Alphabetical Listing of QML Types
*/
diff --git a/doc/src/imports/qtsensors5.qdoc b/doc/src/imports/qtsensors5.qdoc
index c3e6a2a0..3f3bb6de 100644
--- a/doc/src/imports/qtsensors5.qdoc
+++ b/doc/src/imports/qtsensors5.qdoc
@@ -56,9 +56,9 @@
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 elements.
+ and ProximitySensor types.
- \section1 QML Elements
+ \section1 QML Types
*/
diff --git a/doc/src/porting.qdoc b/doc/src/porting.qdoc
index 48b904cf..cb899439 100644
--- a/doc/src/porting.qdoc
+++ b/doc/src/porting.qdoc
@@ -43,7 +43,7 @@
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 elements for
+ to the new QML import because the new QML import does not provide types for
every sensor like the legacy QML import does.
\table