summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-07-27 19:01:30 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-30 09:51:46 +0200
commitc22668590a418cb2c91f5565a032742150e8e2f1 (patch)
treee3da7594e2b49c87d9abd73e3d450241cda3c549
parent1803ec3f5d1b5ceaa28372937aa5314fcabaa1d5 (diff)
Doc: Changed \qmlclass to \qmltype and added \instantiates
-\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: Ia23873a5e1c9098054f3820355b826611ef19dab Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Harri Heine <harri.heine@nokia.com> Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>
-rw-r--r--src/imports/feedback/qdeclarativefeedbackactuator.cpp3
-rw-r--r--src/imports/feedback/qdeclarativefeedbackeffect.cpp3
-rw-r--r--src/imports/feedback/qdeclarativefileeffect.cpp2
-rw-r--r--src/imports/feedback/qdeclarativehapticseffect.cpp2
-rw-r--r--src/imports/feedback/qdeclarativethemeeffect.cpp2
5 files changed, 7 insertions, 5 deletions
diff --git a/src/imports/feedback/qdeclarativefeedbackactuator.cpp b/src/imports/feedback/qdeclarativefeedbackactuator.cpp
index 383bef5..867eafb 100644
--- a/src/imports/feedback/qdeclarativefeedbackactuator.cpp
+++ b/src/imports/feedback/qdeclarativefeedbackactuator.cpp
@@ -42,7 +42,8 @@
#include "qdeclarativefeedbackactuator_p.h"
/*!
- \qmlclass Actuator QFeedbackActuator
+ \qmltype Actuator
+ \instantiates QFeedbackActuator
\brief The Actuator element represents a feedback actuator.
\ingroup qml-feedback-api
diff --git a/src/imports/feedback/qdeclarativefeedbackeffect.cpp b/src/imports/feedback/qdeclarativefeedbackeffect.cpp
index 7d72079..180acb2 100644
--- a/src/imports/feedback/qdeclarativefeedbackeffect.cpp
+++ b/src/imports/feedback/qdeclarativefeedbackeffect.cpp
@@ -42,7 +42,8 @@
#include "qdeclarativefeedbackeffect_p.h"
/*!
- \qmlclass FeedbackEffect QDeclarativeFeedbackEffect
+ \qmltype FeedbackEffect
+ \instantiates QDeclarativeFeedbackEffect
\brief The FeedbackEffect element is the base class for all feedback effects.
\ingroup qml-feedback-api
diff --git a/src/imports/feedback/qdeclarativefileeffect.cpp b/src/imports/feedback/qdeclarativefileeffect.cpp
index 4db1818..58ce7a6 100644
--- a/src/imports/feedback/qdeclarativefileeffect.cpp
+++ b/src/imports/feedback/qdeclarativefileeffect.cpp
@@ -42,7 +42,7 @@
#include "qdeclarativefileeffect_p.h"
/*!
\internal
- \qmlclass FileEffect
+ \qmltype FileEffect
\brief The FileEffect element represents feedback data stored in a file.
\ingroup qml-feedback-api
\inherits FeedbackEffect
diff --git a/src/imports/feedback/qdeclarativehapticseffect.cpp b/src/imports/feedback/qdeclarativehapticseffect.cpp
index 2d409ea..aa818f8 100644
--- a/src/imports/feedback/qdeclarativehapticseffect.cpp
+++ b/src/imports/feedback/qdeclarativehapticseffect.cpp
@@ -41,7 +41,7 @@
#include "qdeclarativehapticseffect_p.h"
/*!
- \qmlclass HapticsEffect
+ \qmltype HapticsEffect
\brief The HapticsEffect element represents a custom haptic feedback effect.
\ingroup qml-feedback-api
\inherits FeedbackEffect
diff --git a/src/imports/feedback/qdeclarativethemeeffect.cpp b/src/imports/feedback/qdeclarativethemeeffect.cpp
index bd5b02a..664c770 100644
--- a/src/imports/feedback/qdeclarativethemeeffect.cpp
+++ b/src/imports/feedback/qdeclarativethemeeffect.cpp
@@ -41,7 +41,7 @@
#include "qdeclarativethemeeffect_p.h"
/*!
- \qmlclass ThemeEffect
+ \qmltype ThemeEffect
\brief The ThemeEffect element represents a themed feedback effect.
\ingroup qml-feedback-api