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

4 files changed, 62 insertions, 34 deletions

diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf
index 10b7be5..bf6c0dc 100644
--- a/tools/qdoc3/test/qt-api-only.qdocconf
+++ b/tools/qdoc3/test/qt-api-only.qdocconf
@@ -25,6 +25,13 @@ qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
                     $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
+# Remove the QML documentation from the Qt-only documentation.
+
+excludedirs += $QT_SOURCE_TREE/src/declarative \
+               $QT_SOURCE_TREE/src/imports \
+               $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative \
+               $QT_SOURCE_TREE/doc/src/declarative
+
 outputdir         = $QT_BUILD_TREE/doc-build/html-qt
 tagfile           = $QT_BUILD_TREE/doc-build/html-qt/qt.tags
 base              = file:$QT_BUILD_TREE/doc-build/html-qt
diff --git a/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf b/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf
index aa3ab01..70e0235 100644
--- a/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-api-only_ja_JP.qdocconf
@@ -25,6 +25,13 @@ qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
                     $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
+# Remove the QML documentation from the Qt-only documentation.
+
+excludedirs += $QT_SOURCE_TREE/src/declarative \
+               $QT_SOURCE_TREE/src/imports \
+               $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative \
+               $QT_SOURCE_TREE/doc/src/declarative
+
 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-api-only_zh_CN.qdocconf b/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf
index c722ee8..d6bf410 100644
--- a/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-api-only_zh_CN.qdocconf
@@ -25,6 +25,13 @@ qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
                     $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
+# Remove the QML documentation from the Qt-only documentation.
+
+excludedirs += $QT_SOURCE_TREE/src/declarative \
+               $QT_SOURCE_TREE/src/imports \
+               $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative \
+               $QT_SOURCE_TREE/doc/src/declarative
+
 outputdir         = $QT_BUILD_TREE/doc-build/html-qt_zh_CN
 tagfile           = $QT_BUILD_TREE/doc-build/html-qt_zh_CN/qt.tags
 base              = file:$QT_BUILD_TREE/doc-build/html-qt_zh_CN
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 5575b7b..e4ed1bc 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -9,7 +9,7 @@ versionsym              =
 version                 = %VERSION%
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.7
-online			= true
+online                  = true
 
 sourceencoding          = UTF-8
 outputencoding          = UTF-8
@@ -26,39 +26,46 @@ qhp.Qt.indexRoot           =
 # 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_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/narrow.js \
-			     scripts/superfish.js \
-			     style/narrow.css \
-			     style/superfish.css \
-			     style/style_ie6.css \
-			     style/style_ie7.css \
-			     style/style_ie8.css \
-			     style/style.css
+                 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
 
 qhp.Qt.filterAttributes    = qt 4.7.0 qtrefdoc
 qhp.Qt.customFilters.Qt.name = Qt 4.7.0
@@ -139,7 +146,7 @@ exampledirs             = $QTDIR/doc/src \
 imagedirs               = $QTDIR/doc/src/images \
                           $QTDIR/examples \
                           $QTDIR/doc/src/declarative/pics \
-			  $QTDIR/doc/src/template/images
+                          $QTDIR/doc/src/template/images
 outputdir               = $QTDIR/doc/html
 tagfile                 = $QTDIR/doc/html/qt.tags
 base                    = file:$QTDIR/doc/html