diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:04 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 14:33:04 +0200 |
commit | 0784f45d046f481f91dd9b701e237836c8b3fb11 (patch) | |
tree | 2e001c09ec5ef3945440d232c007297755d72bab /examples/sensors/grue/import/main.cpp | |
parent | d9776fc6aa8e90926fa024bb64c4e31406d1d091 (diff) | |
parent | ed96b2ea42bd95feeba1085665286a33c9672ab1 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie5c68600ed2b7d6145497dcbceae5f320f7eea6f
Diffstat (limited to 'examples/sensors/grue/import/main.cpp')
-rw-r--r-- | examples/sensors/grue/import/main.cpp | 7 |
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 */ |