diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-18 10:31:10 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 11:06:15 +0200 |
| commit | 18d6bf40169a5765ee35f00131d470fd64125e22 (patch) | |
| tree | 4fcde7524dd44411dd027baf2049b8c455528246 /doc | |
| parent | e624c2d9b0940f0abc24ef7685238299fec5c36e (diff) | |
Doc: Unifying directories for the configuration files.
-Added information that the qch version is for Qt Quick 2.
Change-Id: I8d1a090534c3078b30066efc5a10cded358a80b8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qtquick-dita.qdocconf | 18 | ||||
| -rw-r--r-- | doc/config/qtquick.qdocconf | 5 |
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 |