Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits)
  Attempt to fix build failure on Linux introduced by 09c6a81109
  minor cosmetic improvements
  designer: add sorting in signal-slot editor window
  deprecate header files in $$QT_BUILD_TREE/include/Qt
  syncqt: change tabs to spaces
  I10n: Update German translations for 4.7.0
  Fix a freetype link failure.
  Fix configure test for DirectFB
  Split Symbian bearer plugin into three platform specfic plugins
  Doc: Fixed whitespace in the other configuration file for zh_CN.
  Doc: Fixed whitespace in the Simplified Chinese doc configuration.
  Unbreak Linux build when qendian.h is included before qglobal.h
  Revert accidental commit of irrelevant stuff. Silly mondays..
  Unbreak Linux build when qendian.h is included before qglobal.h
  Fix QApplication/QWidget to really take ownership of input contexts
  Added setting a hotspot on standard gestures
  Fixed GestureOverride event delivery in GraphicsView.
  add check-ts target to auto-asses translation completeness
  qt_ja_JP.ts => qt_ja.ts
  Fix incorrect \since tag
  ...

10 files changed, 504 insertions, 51 deletions

diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index a25bd5dc4c..55477611c2 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -63,6 +63,7 @@
 #include <QtGui/QAction>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QMenu>
+#include <QtGui/QSortFilterProxyModel>
 #include <QtGui/QStandardItemModel>
 #include <QtGui/QComboBox>
 #include <QtGui/QApplication>
@@ -712,9 +713,12 @@ SignalSlotEditorWindow::SignalSlotEditorWindow(QDesignerFormEditorInterface *cor
     m_remove_button(new QToolButton),
     m_core(core),
     m_model(new ConnectionModel(this)),
+    m_proxy_model(new QSortFilterProxyModel(this)),
     m_handling_selection_change(false)
 {
-    m_view->setModel(m_model);
+    m_proxy_model->setSourceModel(m_model);
+    m_view->setModel(m_proxy_model);
+    m_view->setSortingEnabled(true);
     m_view->setItemDelegate(new ConnectionDelegate(this));
     m_view->setEditTriggers(QAbstractItemView::DoubleClicked
                                 | QAbstractItemView::EditKeyPressed);
@@ -790,7 +794,7 @@ void SignalSlotEditorWindow::updateDialogSelection(Connection *con)
     if (m_handling_selection_change || m_editor == 0)
         return;
 
-    QModelIndex index = m_model->connectionToIndex(con);
+    QModelIndex index = m_proxy_model->mapFromSource(m_model->connectionToIndex(con));
     if (index == m_view->currentIndex())
         return;
     m_handling_selection_change = true;
@@ -808,7 +812,7 @@ void SignalSlotEditorWindow::updateEditorSelection(const QModelIndex &index)
     if (m_editor == 0)
         return;
 
-    Connection *con = m_model->indexToConnection(index);
+    Connection *con = m_model->indexToConnection(m_proxy_model->mapToSource(index));
     if (m_editor->selected(con))
         return;
     m_handling_selection_change = true;
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
index 9315955989..665f0b73ae 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
@@ -50,6 +50,7 @@ QT_BEGIN_NAMESPACE
 class QDesignerFormWindowInterface;
 class QDesignerFormEditorInterface;
 class QModelIndex;
+class QSortFilterProxyModel;
 class QTreeView;
 class QToolButton;
 
@@ -84,6 +85,7 @@ private:
     QToolButton *m_add_button, *m_remove_button;
     QDesignerFormEditorInterface *m_core;
     ConnectionModel *m_model;
+    QSortFilterProxyModel *m_proxy_model;
     bool m_handling_selection_change;
 };
 
diff --git a/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf b/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf
new file mode 100644
index 0000000000..aa3ab0177b
--- /dev/null
+++ b/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf
@@ -0,0 +1,30 @@
+include(qt-build-docs_ja_JP.qdocconf)
+
+# Ensures that the generated index contains a URL that can be used by the
+# tools documentation (assistant.qdocconf, designer.qdocconf, linguist.qdocconf,
+# qmake.qdocconf).
+
+url                     = ./
+
+# Ensures that the documentation for the tools is not included in the generated
+# .qhp file.
+
+qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/taskmenuextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
+
+outputdir         = $QT_BUILD_TREE/doc-build/html-qt_ja_JP
+tagfile           = $QT_BUILD_TREE/doc-build/html-qt_ja_JP/qt.tags
+base              = file:$QT_BUILD_TREE/doc-build/html-qt_ja_JP
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 00704eab69..216ac6ae3e 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"
diff --git a/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
new file mode 100644
index 0000000000..e517b334c3
--- /dev/null
+++ b/tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
@@ -0,0 +1,110 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-html-templates_ja_JP.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qt
+description             = Qt リファレンスドキュメント
+url                     = http://qt.nokia.com/doc/ja_JP/4.7
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = ja
+
+indexes                 = $QT_BUILD_TREE/doc-build/html-qt/qt.index
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.title               = Qt
+qhp.Qt.indexTitle          = Qt
+qhp.Qt.selectors           = fake:example
+
+qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.7.0
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+
+# 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/arrow-down.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/OfflineStyle.css \
+			    style/style_ie6.css \
+			    style/style_ie7.css \
+			    style/style_ie8.css \
+			    style/style.css
+
+language                = Cpp
+
+sourcedirs              = $QT_SOURCE_TREE/doc/src/ja_JP
+
+excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
+                          $QT_SOURCE_TREE/src/3rdparty/des \
+                          $QT_SOURCE_TREE/src/3rdparty/freetype \
+                          $QT_SOURCE_TREE/src/3rdparty/harfbuzz \
+                          $QT_SOURCE_TREE/src/3rdparty/kdebase \
+                          $QT_SOURCE_TREE/src/3rdparty/libjpeg \
+                          $QT_SOURCE_TREE/src/3rdparty/libmng \
+                          $QT_SOURCE_TREE/src/3rdparty/libpng \
+                          $QT_SOURCE_TREE/src/3rdparty/libtiff \
+                          $QT_SOURCE_TREE/src/3rdparty/md4 \
+                          $QT_SOURCE_TREE/src/3rdparty/md5 \
+                          $QT_SOURCE_TREE/src/3rdparty/patches \
+                          $QT_SOURCE_TREE/src/3rdparty/sha1 \
+                          $QT_SOURCE_TREE/src/3rdparty/sqlite \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
+                          $QT_SOURCE_TREE/src/3rdparty/wintab \
+                          $QT_SOURCE_TREE/src/3rdparty/zlib \
+                          $QT_SOURCE_TREE/doc/src/snippets \
+                          $QT_SOURCE_TREE/doc/src/zh_CN \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
+
+exampledirs             = $QT_SOURCE_TREE/doc/src \
+                          $QT_SOURCE_TREE/examples/ja_JP \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/examples/tutorials \
+                          $QT_SOURCE_TREE \
+                          $QT_SOURCE_TREE/qmake/examples \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QT_SOURCE_TREE/doc/src/ja_JP/images \
+                          $QT_SOURCE_TREE/doc/src/images \
+                          $QT_SOURCE_TREE/examples \
+			  $QT_SOURCE_TREE/doc/src/template/images
+outputdir               = $QT_BUILD_TREE/doc/html_ja_JP
+tagfile                 = $QT_BUILD_TREE/doc/html_ja_JP/qt.tags
+base                    = file:$QT_BUILD_TREE/doc/html_ja_JP
+
+HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index 712e23f9af..909a2d4a57 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -30,32 +30,32 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # 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/arrow-down.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_ie6.css \
-									style/style_ie7.css \
-									style/style_ie8.css \
-									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/arrow-down.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_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
+                             style/style.css
 
 language                = Cpp
 
@@ -80,6 +80,7 @@ excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
                           $QT_SOURCE_TREE/src/3rdparty/wintab \
                           $QT_SOURCE_TREE/src/3rdparty/zlib \
                           $QT_SOURCE_TREE/doc/src/snippets \
+                          $QT_SOURCE_TREE/doc/src/ja_JP \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
                           $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
new file mode 100644
index 0000000000..027548eacb
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
@@ -0,0 +1,178 @@
+HTML.stylesheets        =  style/style.css \
+									style/OfflineStyle.css \
+									style/style_ie7.css \
+									style/style_ie8.css \
+									style/style_ie6.css
+									
+HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+			  "    <div class=\"content\"> \n" \
+			  "    <div id=\"nav-logo\">\n" \
+			  "      <a href=\"index.html\">Home</a></div>\n" \
+			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+			  "		<fieldset>\n" \
+              "		<input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+			  "		 </fieldset>\n" \
+			  "		</form></div>\n" \
+			  "    <div id=\"nav-topright\">\n" \
+			  "      <ul>\n" \
+			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+			  "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
+			  "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+			  "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+			  "          DOC</a></li>\n" \
+			  "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+			  "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
+			  "      </ul>\n" \
+			  "    </div>\n" \
+			  "    <div id=\"shortCut\">\n" \
+			  "      <ul>\n" \
+			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
+			  "        </a></li>\n" \
+			  "      </ul>\n" \
+			  "     </div>\n" \
+			 " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+			"		 <li><a href=\"#\">API Lookup</a> \n" \
+			"			 <ul id=\"topmenuLook\"> \n" \
+			"			   <li><a href=\"classes.html\">Class index</a></li> \n" \
+			" 			  <li><a href=\"functions.html\">Function index</a></li> \n" \
+			"			   <li><a href=\"modules.html\">Modules</a></li> \n" \
+			"			   <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+			"			   <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+			"			   <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+			"			   </ul> \n" \
+			"		 </li> \n" \
+			"		 <li><a href=\"#\">Qt Topics</a> \n" \
+			"			 <ul id=\"topmenuTopic\"> \n" \
+			"			   <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+			"			   <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+			"			   <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+			"			   <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+			"			 </ul> \n" \
+			"		</li> \n" \
+			"		 <li><a href=\"#\">Examples</a> \n" \
+			"			 <ul id=\"topmenuexample\"> \n" \
+			"				 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+			"				 <li><a href=\"tutorials.html\">チュートリアル</a></li> \n" \
+			"				 <li><a href=\"demos.html\">Demos</a></li> \n" \
+			"				 <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+			"				 <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+			"			 </ul> \n" \
+			"		 </li> \n" \
+			" </ul> \n" \
+			  "    </div>\n" \
+			  "  </div>\n" \
+			  "  <div class=\"wrapper\">\n" \
+			  "    <div class=\"hd\">\n" \
+			  "      <span></span>\n" \
+			  "    </div>\n" \
+			  "    <div class=\"bd group\">\n" \
+			  "      <div class=\"sidebar\">\n" \
+			  "        <div class=\"searchlabel\">\n" \
+			  "          Search index:</div>\n" \
+			  "        <div class=\"search\">\n" \
+			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+			  "            <fieldset>\n" \
+			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+			  "            </fieldset>\n" \
+			  "          </form>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+			  "          <h2 title=\"API Lookup\"><span></span>\n" \
+			  "            API Lookup</h2>\n" \
+			  "          <div  id=\"list001\" class=\"list\">\n" \
+			  "          <ul id=\"ul001\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+			  "            </ul> \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
+			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
+			  "            Qt Topics</h2>\n" \
+			  "          <div id=\"list002\" class=\"list\">\n" \
+			  "            <ul id=\"ul002\" >\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+			  "            </ul>  \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"box\" id=\"examples\">\n" \
+			  "          <h2 title=\"Examples\"><span></span>\n" \
+			  "            Examples</h2>\n" \
+			  "          <div id=\"list003\" class=\"list\">\n" \
+			  "        <ul id=\"ul003\">\n" \
+			  "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">チュートリアル</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+			  "            </ul> \n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "      </div>\n" \
+			  "      <div class=\"wrap\">\n" \
+			  "        <div class=\"toolbar\">\n" \
+			  "          <div class=\"breadcrumb toolblock\">\n" \
+			  "            <ul>\n" \
+			  "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+			  "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader     = "            </ul>\n" \
+			  "          </div>\n" \
+			  "          <div class=\"toolbuttons toolblock\">\n" \
+			  "            <ul>\n" \
+			  "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+			  "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+			  "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+			  "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+			  "                <span>Print</span></a></li>\n" \
+			  "            </ul>\n" \
+			  "          </div>\n" \
+			  "        </div>\n" \
+			  "        <div class=\"content\">\n"
+
+HTML.footer             = "        <!-- /div -->\n" \
+			  "        <div class=\"feedback t_button\">\n" \
+			  "          [+] Documentation Feedback</div>\n" \
+			  "      </div>\n" \
+			  "    </div>\n" \
+			  "    <div class=\"ft\">\n" \
+			  "      <span></span>\n" \
+			  "    </div>\n" \
+			  "  </div> \n" \
+			  "  <div class=\"footer\">\n" \
+			  "    <p>\n" \
+			  "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+			  "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+			  "      in Finland and/or other countries worldwide.</p>\n" \
+			  "    <p>\n" \
+			  "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+			  "  </div>\n" \
+			  "  <div id=\"feedbackBox\">\n" \
+			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
+			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+			  "    </form>\n" \
+			  "  </div>\n" \
+			  "  <div id=\"blurpage\">\n" \
+			  "  </div>\n" \
+			  "<script type=\"text/javascript\">\n" \
+			  "  var _gaq = _gaq || [];\n" \
+			  "  _gaq.push([\'_setAccount\', \'UA-4457116-5\']);\n" \
+			  "  _gaq.push([\'_trackPageview\']);\n" \
+			  "  (function() {\n" \
+			  "    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;\n" \
+			  "    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';\n" \
+			  "    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);\n" \
+			  "  })();\n" \
+			  "</script>\n"
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index edf6d92119..d13277173a 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -130,6 +130,7 @@ excludedirs             = $QTDIR/src/3rdparty/clucene \
                           $QTDIR/src/3rdparty/phonon/mmf \
                           $QTDIR/src/3rdparty/phonon/waveout \
                           $QTDIR/doc/src/snippets \
+                          $QTDIR/doc/src/ja_JP \
                           $QTDIR/doc/src/zh_CN
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
diff --git a/tools/qdoc3/test/qt_ja_JP.qdocconf b/tools/qdoc3/test/qt_ja_JP.qdocconf
new file mode 100644
index 0000000000..d4141c7535
--- /dev/null
+++ b/tools/qdoc3/test/qt_ja_JP.qdocconf
@@ -0,0 +1,125 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-html-templates_ja_JP.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qt
+versionsym              =
+version                 = %VERSION%
+description             = Qt リファレンスドキュメント
+url                     = http://qt.nokia.com/doc/ja_JP/4.7
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = ja
+
+indexes                 = $QTDIR/doc/html/qt.index
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.470
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.title               = Qt
+qhp.Qt.indexTitle          = Qt
+qhp.Qt.selectors           = fake:example
+
+qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc ja_JP
+qhp.Qt.customFilters.Qt.name = Qt 4.7.0
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
+
+# 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_ll_blank.png \
+			    images/bg_ul_blank.png \
+			    images/header_bg.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/arrow_down.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 \
+			    scripts/shBrushCpp.js \
+			    scripts/shCore.js \
+			    scripts/shLegacy.js \
+			    scripts/narrow.js \
+			    scripts/superfish.js \
+			    style/shCore.css \
+			    style/shThemeDefault.css \
+			    style/narrow.css \
+			    style/superfish.css \
+			    style/superfish_skin.css \
+			    style/OfflineStyle.css \
+			    style/style_ie6.css \
+			    style/style_ie7.css \
+			    style/style_ie8.css \
+			    style/style.css
+
+language                = Cpp
+
+sourcedirs              = $QTDIR/doc/src/ja_JP
+
+excludedirs             = $QTDIR/src/3rdparty/clucene \
+                          $QTDIR/src/3rdparty/des \
+                          $QTDIR/src/3rdparty/freetype \
+                          $QTDIR/src/3rdparty/harfbuzz \
+                          $QTDIR/src/3rdparty/kdebase \
+                          $QTDIR/src/3rdparty/libjpeg \
+                          $QTDIR/src/3rdparty/libmng \
+                          $QTDIR/src/3rdparty/libpng \
+                          $QTDIR/src/3rdparty/libtiff \
+                          $QTDIR/src/3rdparty/md4 \
+                          $QTDIR/src/3rdparty/md5 \
+                          $QTDIR/src/3rdparty/patches \
+                          $QTDIR/src/3rdparty/sha1 \
+                          $QTDIR/src/3rdparty/sqlite \
+                          $QTDIR/src/3rdparty/webkit/JavaScriptCore \
+                          $QTDIR/src/3rdparty/webkit/WebCore \
+                          $QTDIR/src/3rdparty/wintab \
+                          $QTDIR/src/3rdparty/zlib \
+                          $QTDIR/doc/src/snippets \
+                          $QTDIR/doc/src/zh_CN \
+                          $QTDIR/src/3rdparty/phonon/gstreamer \
+                          $QTDIR/src/3rdparty/phonon/ds9 \
+                          $QTDIR/src/3rdparty/phonon/qt7 \
+                          $QTDIR/src/3rdparty/phonon/mmf \
+                          $QTDIR/src/3rdparty/phonon/waveout
+
+sources.fileextensions  = "*.cpp *.qdoc *.mm"
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
+examples.imageextensions = "*.png"
+
+exampledirs             = $QTDIR/doc/src \
+                          $QTDIR/examples/ja_JP \
+                          $QTDIR/examples \
+                          $QTDIR/examples/tutorials \
+                          $QTDIR \
+                          $QTDIR/qmake/examples \
+                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QTDIR/doc/src/ja_JP/images \
+                          $QTDIR/doc/src/images \
+                          $QTDIR/examples \
+			  $QTDIR/doc/src/template/images
+outputdir               = $QTDIR/doc/html_ja_JP
+tagfile                 = $QTDIR/doc/html_ja_JP/qt.tags
+base                    = file:$QTDIR/doc/html_ja_JP
+
+HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index db02478595..4983f9e6a6 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -32,28 +32,28 @@ qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.0
 # 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/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
+                             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
 
@@ -78,6 +78,7 @@ excludedirs             = $QTDIR/src/3rdparty/clucene \
                           $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 \