summaryrefslogtreecommitdiffstats
path: root/src/corelib/doc/src/objectmodel
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2012-12-14 14:19:43 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-14 17:12:44 +0100
commit69e602941112da325b1154e0dc52714bc27a2cc8 (patch)
treef5da4c5ddfe059ab9847cd5ed384f9e7ce17d8b3 /src/corelib/doc/src/objectmodel
parent65c9706f14fda233601b8318b1f3a20422d6a166 (diff)
Doc: Moved content from qtdoc
- The qdoc pages were related to qtcore and they were referring to snippets inside the qtcore module boundary. - Fixed the exampledirs for QtCore to include the examples that are referred by the \snippet instances in the moved qdoc pages work. Change-Id: Ibb6dbb131920ea8692a203f6145863e5012e4602 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/corelib/doc/src/objectmodel')
-rw-r--r--src/corelib/doc/src/objectmodel/object.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/doc/src/objectmodel/object.qdoc b/src/corelib/doc/src/objectmodel/object.qdoc
index 47f56372de..edf5673da0 100644
--- a/src/corelib/doc/src/objectmodel/object.qdoc
+++ b/src/corelib/doc/src/objectmodel/object.qdoc
@@ -47,7 +47,7 @@
properties}
\li powerful \l{The Event System}{events and event filters}
\li contextual \l{i18n}{string translation for internationalization}
- \li sophisticated interval driven \l timers that make it possible
+ \li sophisticated interval driven \l {Timers}{timers} that make it possible
to elegantly integrate many tasks in an event-driven GUI
\li hierarchical and queryable \l{Object Trees & Ownership}{object
trees} that organize object ownership in a natural way
@@ -56,6 +56,7 @@
pointers which become dangling pointers when their objects are destroyed
\li a \l{metaobjects.html#qobjectcast}{dynamic cast} that works across
library boundaries.
+ \li support for \l{Creating Custom Qt Types}{custom type} creation.
\endlist
Many of these Qt features are implemented with standard C++