summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-07-05 15:36:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-09 10:56:49 +0200
commit5de25a10442824a478a2787d552eb1ed6d504ad2 (patch)
treec8d3a66b9f0d1d941b6233c8683fb6d362c989a8
parentdc8430fb534e67a083022ddfc7f31a7555edc7a3 (diff)
Doc: Added "All QML Types" and "Obsolete QML Types" pages.
-used the same style and wording as the C++ pages. Task-number: QTBUG-31490 Change-Id: I429863170de0a66ba5a5d5fed7f0bd67087f7cb6 Reviewed-by: Martin Smith <martin.smith@digia.com>
-rw-r--r--doc/src/classes.qdoc42
-rw-r--r--doc/src/index.qdoc2
2 files changed, 43 insertions, 1 deletions
diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc
index 7ede0a01e..e76a61050 100644
--- a/doc/src/classes.qdoc
+++ b/doc/src/classes.qdoc
@@ -59,6 +59,23 @@
*/
/*!
+ \page qmltypes.html
+ \title All QML Types
+ \ingroup classlists
+
+ \brief A list of QML types in this Qt release.
+
+ This is a list of all QML types. The \l{All QML APIs by Module} contains a
+ list of the QML APIs by module. For types that have been deprecated, see the
+ \l{Obsolete QML Types} list.
+
+ \b{See also} \l{Class and Function Documentation}.
+
+ \generatelist qmltypes
+
+*/
+
+/*!
\page annotated.html
\title Annotated Class List
\ingroup classlists
@@ -126,6 +143,31 @@
*/
+ /*!
+ \page obsoleteqmltypes.html
+ \title Obsolete QML Types
+ \ingroup classlists
+ \brief A list of obsolete QML types that should not be used in new code.
+
+ The following QML types are now obsolete. Obsolete types
+ are no longer maintained. They are provided to keep old source
+ code working, but they can be removed in a future release. We
+ strongly advise against using these classes in new code.
+
+ \generatelist obsoleteqmltypes
+ \section1 QML Types with Obsolete Properties or Methods
+
+ The following QML types contain one or more properties or methods that are
+ now obsolete. Obsolete members are no longer maintained. They are
+ provided to keep old source code working, but they can be removed
+ in a future release. We strongly advise against using these obsolete
+ members in new code. Click on a type to see its deprecated members.
+
+ \generatelist obsoleteqmlmembers
+
+ \sa {All QML Types}, {Class and Function Documentation}
+*/
+
/*!
\page functions.html
\title All Functions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 0c58ca645..5bcc97fa0 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -101,8 +101,8 @@
\div {class="indexboxcont indexboxbar"}
\list
\li \l{All Classes}{All Qt C++ Classes}
+ \li \l{All QML Types}
\li \l{All Modules}{All Qt Modules}
- \li \l{All QML APIs by Module}
\li \l{Qt Creator Manual}
\endlist
\list