diff options
author | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-06-30 17:06:37 (GMT) |
commit | 0713442baa4120050e85c13998797415bb40efce (patch) | |
tree | 2735cae5573363fd5edceae71ae8b7af60518df2 /tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | |
parent | 08478207ee9a6563ae63ebcef833925db6426bd8 (diff) | |
parent | 01648005f1f546dc0281155fecd94b4f47a94584 (diff) | |
download | Qt-0713442baa4120050e85c13998797415bb40efce.zip Qt-0713442baa4120050e85c13998797415bb40efce.tar.gz Qt-0713442baa4120050e85c13998797415bb40efce.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
tools/qdoc3/test/qt-html-templates.qdocconf
Diffstat (limited to 'tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf')
-rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 909a2d4..be459d8 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -52,6 +52,17 @@ qhp.Qt.extraFiles = index.html \ 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 \ @@ -99,7 +110,8 @@ exampledirs = $QT_SOURCE_TREE/doc/src \ $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs imagedirs = $QT_SOURCE_TREE/doc/src/images \ $QT_SOURCE_TREE/examples \ - $QT_SOURCE_TREE/doc/src/template/images + $QT_SOURCE_TREE/doc/src/declarative/pics \ + $QT_SOURCE_TREE/doc/src/template/images outputdir = $QT_BUILD_TREE/doc/html_zh_CN tagfile = $QT_BUILD_TREE/doc/html_zh_CN/qt.tags base = file:$QT_BUILD_TREE/doc/html_zh_CN |