summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/doc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-04-06 10:45:44 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-04-06 10:45:44 (GMT)
commit1db38c5ccb6188889bac1ae5e6f1d415a59ac444 (patch)
tree31e5b3bd0888b1c68f64ae4f68bad2ac79b95284 /tools/qdoc3/doc
parentc772ab261c3a09fab786306c70796c3c5f0efb15 (diff)
downloadQt-1db38c5ccb6188889bac1ae5e6f1d415a59ac444.zip
Qt-1db38c5ccb6188889bac1ae5e6f1d415a59ac444.tar.gz
Qt-1db38c5ccb6188889bac1ae5e6f1d415a59ac444.tar.bz2
qdoc: Updated the QDoc manual.
Diffstat (limited to 'tools/qdoc3/doc')
-rw-r--r--tools/qdoc3/doc/corefeatures.qdoc8
-rw-r--r--tools/qdoc3/doc/qdoc-manual.qdoc15
2 files changed, 11 insertions, 12 deletions
diff --git a/tools/qdoc3/doc/corefeatures.qdoc b/tools/qdoc3/doc/corefeatures.qdoc
new file mode 100644
index 0000000..50bd726
--- /dev/null
+++ b/tools/qdoc3/doc/corefeatures.qdoc
@@ -0,0 +1,8 @@
+/*!
+ \page corefeatures.html
+ \title Core Features
+
+ \input examples/signalandslots.qdocinc
+ \input examples/objectmodel.qdocinc
+ \input examples/layoutmanagement.qdocinc
+*/
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 0e4055b..5b15fca 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -3999,20 +3999,11 @@
Here are links to the \c .qdocinc files used above:
\l{signalandslots.qdocinc}, \l{objectmodel.qdocinc},
- \l{layoutmanagement.qdocinc}. QDoc renders this page as:
-
- \quotation
- \raw HTML
- <h1>Core Features</h1>
- \endraw
-
- \input examples/signalandslots.qdocinc
- \input examples/objectmodel.qdocinc
- \input examples/layoutmanagement.qdocinc
- \endquotation
+ \l{layoutmanagement.qdocinc}. QDoc renders this page
+ \l{corefeatures.html} {as shown here}.
\target 2-argument-form}
- \section2 \\include filename snippet-identifier
+ \section2 \\include filename snippet-identifier \span {class="newStuff"} {(new)}
It is kind of a pain to make a separate \c .qdocinc file for every
QDoc include snippet you want to use in multiple places in the