summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-03-14 13:24:57 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-14 15:06:29 +0100
commitf764163c1c9cd2ea575971689096921e017d1a46 (patch)
tree2f0d9b5b2af8dc2ac7778abf3402d2873d07a57d
parent83e668468a204b3812b9466bbdd0ffafda7a6b21 (diff)
Fix generating the qdoc3 manual in 4.8
There were some qdoc errors when generating the qdoc manual. This change fixes thoise qdoc errors. Change-Id: I9e12abbc6688f0fefc3534d830d581a80f5b973a Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
-rw-r--r--tools/qdoc3/doc/config/compat.qdocconf1
-rw-r--r--tools/qdoc3/doc/corefeatures.qdoc6
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/qdoc3/doc/config/compat.qdocconf b/tools/qdoc3/doc/config/compat.qdocconf
index 4b8d7a490d..d01a6d565f 100644
--- a/tools/qdoc3/doc/config/compat.qdocconf
+++ b/tools/qdoc3/doc/config/compat.qdocconf
@@ -2,6 +2,7 @@ macro.0 = "\\\\0"
macro.b = "\\\\b"
macro.n = "\\\\n"
macro.r = "\\\\r"
+macro.e = "\\i"
macro.i = "\\o"
macro.i11 = "\\o{1,1}"
macro.i12 = "\\o{1,2}"
diff --git a/tools/qdoc3/doc/corefeatures.qdoc b/tools/qdoc3/doc/corefeatures.qdoc
index 6ad52fed2a..6ddfd164a4 100644
--- a/tools/qdoc3/doc/corefeatures.qdoc
+++ b/tools/qdoc3/doc/corefeatures.qdoc
@@ -29,7 +29,7 @@
\page corefeatures.html
\title Core Features
- \input examples/signalandslots.qdocinc
- \input examples/objectmodel.qdocinc
- \input examples/layoutmanagement.qdocinc
+ \include examples/signalandslots.qdocinc
+ \include examples/objectmodel.qdocinc
+ \include examples/layoutmanagement.qdocinc
*/