summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/doc/examples
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2012-07-27 12:22:05 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-27 17:03:27 +0200
commitbe46199c624d307b891ebb141772f00aecd71ad2 (patch)
tree8b140ad5355137df037477d116092c75cf4a63a2 /src/tools/qdoc/doc/examples
parent022f8ebd1387623c5d524c7dc71ae3237ff05d81 (diff)
qdoc: Updated qdoc manual and qdoc guide
These documents now include the \qmltype and \instantiates commands, and the \qmlclass command is deprecated. Task nr: QTBUG-26648 Change-Id: I62da273be51609e651e33b9088e1667e4c6c1e76 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Diffstat (limited to 'src/tools/qdoc/doc/examples')
-rw-r--r--src/tools/qdoc/doc/examples/componentset/ProgressBar.qml2
-rw-r--r--src/tools/qdoc/doc/examples/componentset/Switch.qml2
-rw-r--r--src/tools/qdoc/doc/examples/componentset/TabWidget.qml2
-rw-r--r--src/tools/qdoc/doc/examples/examples.qdoc2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml
index 5255e864ac..e3867e9783 100644
--- a/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml
+++ b/src/tools/qdoc/doc/examples/componentset/ProgressBar.qml
@@ -41,7 +41,7 @@
import QtQuick 1.0
/*!
- \qmlclass ProgressBar
+ \qmltype ProgressBar
\inqmlmodule UIComponents 1.0
\brief A component that shows the progress of an event
diff --git a/src/tools/qdoc/doc/examples/componentset/Switch.qml b/src/tools/qdoc/doc/examples/componentset/Switch.qml
index 31153d6252..48d69e434f 100644
--- a/src/tools/qdoc/doc/examples/componentset/Switch.qml
+++ b/src/tools/qdoc/doc/examples/componentset/Switch.qml
@@ -41,7 +41,7 @@
import QtQuick 1.0
/*!
- \qmlclass ToggleSwitch
+ \qmltype ToggleSwitch
\inqmlmodule UIComponents 1.0
\brief A component that can be turned on or off
diff --git a/src/tools/qdoc/doc/examples/componentset/TabWidget.qml b/src/tools/qdoc/doc/examples/componentset/TabWidget.qml
index eb64979fb2..3b737a42d7 100644
--- a/src/tools/qdoc/doc/examples/componentset/TabWidget.qml
+++ b/src/tools/qdoc/doc/examples/componentset/TabWidget.qml
@@ -41,7 +41,7 @@
import QtQuick 1.0
/*!
- \qmlclass TabWidget
+ \qmltype TabWidget
\inqmlmodule UIComponents 1.0
\brief A widget that places its children as tabs
diff --git a/src/tools/qdoc/doc/examples/examples.qdoc b/src/tools/qdoc/doc/examples/examples.qdoc
index 236e7ae74a..80b3231226 100644
--- a/src/tools/qdoc/doc/examples/examples.qdoc
+++ b/src/tools/qdoc/doc/examples/examples.qdoc
@@ -43,7 +43,7 @@
\section1 QML Class
- The QML types use the \l{qmlclass-command}{\\qmlclass} to document the
+ The QML types use the \l{qmltype-command}{\\qmltype} to document the
type. In addition, they have the \l{inmodule-command}{\\inmodule}
command in order for QDoc to associate them to the \c UIComponents module.