diff -r 5dc02b23752f -r 3e2da88830cd tools/qdoc3/test/qt_zh_CN.qdocconf
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf	Tue Jul 06 15:10:48 2010 +0300
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf	Wed Aug 18 10:37:55 2010 +0300
@@ -32,27 +32,28 @@
 # Files not referenced in any qdoc file (last four are needed by qtdemo)
 # See also extraimages.HTML
 qhp.Qt.extraFiles          = index.html \
-									images/bg_l.png \
-                             	    images/bg_l_blank.png \
-                             	    images/bg_r.png \
-									images/box_bg.png \
-									images/breadcrumb.png \
-									images/bullet_gt.png \
-                             	    images/bullet_dn.png \
-									images/bullet_sq.png \
-                             	    images/bullet_up.png \
-                             	    images/feedbackground.png \									
-                             	    images/horBar.png \									
-									images/page.png \
-									images/page_bg.png \
-									images/sprites-combined.png \
-                             	    images/stylesheet-coffee-plastique.png \
-                             	    images/taskmenuextension-example.png \
-                             	   images/coloreditorfactoryimage.png \
-                             	   images/dynamiclayouts-example.png \
-									scripts/functions.js \
-									scripts/jquery.js \
-                             	    style/style.css
+                             images/bg_l.png \
+                             images/bg_l_blank.png \
+                             images/bg_r.png \
+                             images/box_bg.png \
+                             images/breadcrumb.png \
+                             images/bullet_gt.png \
+                             images/bullet_dn.png \
+                             images/bullet_sq.png \
+                             images/bullet_up.png \
+                             images/feedbackground.png \
+                             images/horBar.png \
+                             images/page.png \
+                             images/page_bg.png \
+                             images/sprites-combined.png \
+                             images/spinner.gif \
+                             images/stylesheet-coffee-plastique.png \
+                             images/taskmenuextension-example.png \
+                             images/coloreditorfactoryimage.png \
+                             images/dynamiclayouts-example.png \
+                             scripts/functions.js \
+                             scripts/jquery.js \
+                             style/style.css
 
 language                = Cpp
 
@@ -77,6 +78,7 @@
                           $QTDIR/src/3rdparty/wintab \
                           $QTDIR/src/3rdparty/zlib \
                           $QTDIR/doc/src/snippets \
+                          $QTDIR/doc/src/ja_JP \
                           $QTDIR/src/3rdparty/phonon/gstreamer \
                           $QTDIR/src/3rdparty/phonon/ds9 \
                           $QTDIR/src/3rdparty/phonon/qt7 \