summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qt-build-docs.qdocconf
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 07:21:05 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2010-06-17 07:21:05 (GMT)
commitf39c9f38276add6ead9bb5d380cc2b32b0fa3390 (patch)
tree2627db65ca9cddb432232ee21116afea73da07a4 /tools/qdoc3/test/qt-build-docs.qdocconf
parent594900e68f8e264facbe8c75eaf2b857240bc072 (diff)
parentfac227f609e544f8f55aca8447b4328d6534407a (diff)
downloadQt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.zip
Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.gz
Qt-f39c9f38276add6ead9bb5d380cc2b32b0fa3390.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs.qdocconf')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 00704ea..216ac6a 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -115,6 +115,7 @@ excludedirs = $QT_SOURCE_TREE/src/3rdparty/clucene \
$QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
$QT_SOURCE_TREE/src/3rdparty/phonon/waveout \
$QT_SOURCE_TREE/doc/src/snippets \
+ $QT_SOURCE_TREE/doc/src/ja_JP \
$QT_SOURCE_TREE/doc/src/zh_CN
sources.fileextensions = "*.cpp *.qdoc *.mm"