summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-20 00:50:27 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-05-20 00:54:36 (GMT)
commit14cc3a81ec910a6ecc7ede3c0e51566c712bf819 (patch)
treeb3cfeff3f4ade351fd4fa24372fd519f98856304
parent2ba48e94330957158a82cc56d13bf2c301f33c22 (diff)
downloadQt-14cc3a81ec910a6ecc7ede3c0e51566c712bf819.zip
Qt-14cc3a81ec910a6ecc7ede3c0e51566c712bf819.tar.gz
Qt-14cc3a81ec910a6ecc7ede3c0e51566c712bf819.tar.bz2
Create overview page for examples for Extending QML in C++
Task-number: QT-3365 QT-3366
-rw-r--r--doc/src/declarative/examples.qdoc2
-rw-r--r--doc/src/examples/qml-examples.qdoc27
-rw-r--r--doc/src/examples/qml-extending.qdoc (renamed from doc/src/declarative/extending-examples.qdoc)2
3 files changed, 27 insertions, 4 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 5b8c937..72c585b 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -136,7 +136,7 @@ For example, from your build directory, run:
\section2 C++ Extensions
\list
-\o \l{declarative/cppextensions/referenceexamples}{Reference examples} (discussed in \l {Extending QML in C++})
+\o \l{declarative-cppextensions-reference.html}{Reference examples} (discussed in \l {Extending QML in C++})
\o \l{declarative/cppextensions/plugins}{Plugins}
\o \l{declarative/cppextensions/qgraphicslayouts}{QGraphicsLayouts}
\o \l{declarative/cppextensions/qwidgets}{QWidgets}
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 7a0fcca..fa17c6a 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -71,8 +71,31 @@
*/
/*!
- \title Reference examples
- \example declarative/cppextensions/referenceexamples
+ \page declarative-cppextensions-reference.html
+ \title C++ Extensions - Reference examples
+
+ These examples show how QML can be extended from C++ in various ways.
+
+ The code for these examples is used throughout the \l {Extending QML in C++} reference
+ documentation, which highlights the main principles demonstrated in each example.
+
+ Furthermore, here are additional pages that discuss each example in detail:
+
+ \list
+ \o \l {declarative/cppextensions/referenceexamples/adding}{Adding Types}
+ \o \l {declarative/cppextensions/referenceexamples/properties}{Object and List Property Types}
+ \o \l {declarative/cppextensions/referenceexamples/coercion}{Inheritance and Coercion}
+ \o \l {declarative/cppextensions/referenceexamples/default}{Default Property}
+ \o \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties}
+ \o \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties}
+ \o \l {declarative/cppextensions/referenceexamples/signal}{Signal Support}
+ \o \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source}
+ \o \l {declarative/cppextensions/referenceexamples/binding}{Binding}
+ \endlist
+
+ \note These examples all print information to the console to demonstrate the concepts presented.
+ Ensure that you are able to view the application output when running these examples.
+ For example, the dbgView tool on Windows can be used to display application output.
*/
/*!
diff --git a/doc/src/declarative/extending-examples.qdoc b/doc/src/examples/qml-extending.qdoc
index 577ab78..09108d6 100644
--- a/doc/src/declarative/extending-examples.qdoc
+++ b/doc/src/examples/qml-extending.qdoc
@@ -236,7 +236,7 @@ This example builds on:
*/
/*!
-\example declarative/cppextensions/referenceexamples/grouped
+\example declarative/cppextensions/referenceexamples/attached
\title Extending QML - Attached Properties Example
This example builds on: