summaryrefslogtreecommitdiffstats
path: root/examples/sensors/grue/import/main.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-08-13 14:40:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-14 21:03:53 +0200
commit52c831db165f5068826dddef4d41427a98a42dfd (patch)
tree6d79c1c09ca5894fc3beb3f9627047f9cff6e435 /examples/sensors/grue/import/main.cpp
parent6dd954f2b9ce1f241d968d201183f8a80d729e57 (diff)
Doc: Update Grue Sensor example
Fix a number of issues with the example: - Add \omit to generated doc sections, we don't want qdoc to process these (not part of Qt docs) - Combine the 5 separate examples into a single \example and discuss each subproject in a subsection - Add example image to doc - Fix deployment/build target directories and import paths - Define a 'reading' property for the sensor to make it work on QtSensors 5.1 - Fix the Grue QML application to avoid flicker from frequent updates. Task-number: QTBUG-32881 Change-Id: I2785faead1baaf5b1ae9d05df3398e018e945418 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'examples/sensors/grue/import/main.cpp')
-rw-r--r--examples/sensors/grue/import/main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/examples/sensors/grue/import/main.cpp b/examples/sensors/grue/import/main.cpp
index 5f6c925c..4191d623 100644
--- a/examples/sensors/grue/import/main.cpp
+++ b/examples/sensors/grue/import/main.cpp
@@ -66,6 +66,7 @@ public:
// Register the 1.0 interfaces
major = 1;
minor = 0;
+ // @uri Grue
qmlRegisterType <GrueSensor >(package, major, minor, "GrueSensor");
qmlRegisterUncreatableType<GrueSensorReading>(package, major, minor, "GrueSensorReading", QLatin1String("Cannot create GrueSensorReading"));
}
@@ -109,6 +110,7 @@ QT_END_NAMESPACE
#include "main.moc"
/*
+ \omit
\qmltype GrueSensor
\instantiates GrueSensor
\inherits Sensor
@@ -119,9 +121,11 @@ QT_END_NAMESPACE
This type wraps the GrueSensor class. Please see the documentation for
GrueSensor for details.
+ \endomit
*/
/*
+ \omit
\qmltype GrueSensorReading
\instantiates GrueSensorReading
\inherits SensorReading
@@ -134,9 +138,12 @@ QT_END_NAMESPACE
GrueSensorReading for details.
This type cannot be directly created.
+ \endomit
*/
/*
+ \omit
\qmlproperty qreal Grue1::GrueSensorReading::chanceOfBeingEaten
Please see GrueSensorReading::chanceOfBeingEaten for information about this property.
+ \endomit
*/