Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7

1 files changed, 36 insertions, 0 deletions

diff --git a/src/qml/doc/src/examples.qdoc b/src/qml/doc/src/examples.qdoc
index f3550ae199..4f12d42f48 100644
--- a/src/qml/doc/src/examples.qdoc
+++ b/src/qml/doc/src/examples.qdoc
@@ -32,4 +32,40 @@
 
 The list of examples demonstrating how to extend C++ to QML or the other way
 around.
+
+\noautolist
+
+\table
+    \row
+        \li \l {Extending QML - Adding Types Example}
+        \li Exporting C++ Classes
+    \row
+        \li \l {Extending QML - Object and List Property Types Example}
+        \li Exporting C++ Properties
+    \row
+        \li \l {Extending QML - Extension Objects Example}
+        \li Extension Objects
+    \row
+        \li \l {Extending QML - Inheritance and Coercion Example}
+        \li C++ Inheritance and Coercion
+    \row
+        \li \l {Extending QML - Methods Example}
+        \li Methods Support
+    \row
+        \li \l {Extending QML - Attached Properties Example}
+        \li Attached Properties
+    \row
+        \li \l {Extending QML - Signal Support Example}
+        \li Signal Support
+    \row
+        \li \l {Extending QML - Property Value Source Example}
+        \li Property Value Source
+    \row
+        \li \l {Extending QML - Default Property Example}
+        \li Default Property
+    \row
+        \li \l {Extending QML - Grouped Properties Example}
+        \li Grouped Properties
+\endtable
+
 */