aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/config/qtquick-dita.qdocconf18
-rw-r--r--doc/config/qtquick.qdocconf5
2 files changed, 16 insertions, 7 deletions
diff --git a/doc/config/qtquick-dita.qdocconf b/doc/config/qtquick-dita.qdocconf
index e259a2fa74..ee471c1df1 100644
--- a/doc/config/qtquick-dita.qdocconf
+++ b/doc/config/qtquick-dita.qdocconf
@@ -7,9 +7,21 @@ project = Qt Quick
# Images should be placed in <rootdir>/dic/images and examples in
# <rootdir>/examples.
# Paths are relative to the location of this file.
-exampledirs += ../src/examples
-headerdirs += ../src
-sourcedirs += ../src
+exampledirs += ../src/examples \
+ ../.. \
+ ../../examples
+
+headerdirs += ../src \
+ ../../src
+
+imagedirs += ../src/images \
+
+sourcedirs += ../src \
+ ../../src
+
+excludedirs += ../src/qtquick1 \
+ ../../src/qtquick1
+
diff --git a/doc/config/qtquick.qdocconf b/doc/config/qtquick.qdocconf
index 3f4645aeaa..0870bde323 100644
--- a/doc/config/qtquick.qdocconf
+++ b/doc/config/qtquick.qdocconf
@@ -37,10 +37,7 @@ qhp.projects = qtquick
qhp.qtquick.file = qtquick.qhp
# Namespace for the output file. This namespace is used to distinguish between
-# different documentation files in Creator/Assistant. Normal format for MP
-# projects should be: com.nokia.mp.<projectname>.version with version being
-# a number containing a major, minor and revision element. E.g. version 1.0
-# becomes 100.
+# different documentation files in Creator/Assistant. Qt Quick 2 release.
qhp.qtquick.namespace = qtquick.200
# Title for the package, will be the main title for the package in