diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-04-15 18:30:12 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-16 10:14:38 (GMT) |
| commit | 34b2f03f1a375abf4fb4b0c1e645465526071aa0 (patch) | |
| tree | b67fa91bd9856b0e3d5c03ab1b6a56e7dff2e160 | |
| parent | b72d84bb7afc87253892ed853fcbaad502be0013 (diff) | |
| download | Qt-34b2f03f1a375abf4fb4b0c1e645465526071aa0.zip Qt-34b2f03f1a375abf4fb4b0c1e645465526071aa0.tar.gz Qt-34b2f03f1a375abf4fb4b0c1e645465526071aa0.tar.bz2 | |
qdoc: Added the index and fixed images in the extra files list.
Reviewed-by: Trust Me
(cherry picked from commit 5b975e1dc61eaee055afc40fef13358bcd55c7d2)
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs.qdocconf | 14 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf | 13 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-defines.qdocconf | 4 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 13 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt_zh_CN.qdocconf | 13 |
5 files changed, 30 insertions, 27 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf index 900c7c3..dbff4e2 100644 --- a/tools/qdoc3/test/qt-build-docs.qdocconf +++ b/tools/qdoc3/test/qt-build-docs.qdocconf @@ -18,20 +18,20 @@ qhp.Qt.file = qt.qhp qhp.Qt.namespace = com.trolltech.qt.470 qhp.Qt.virtualFolder = qdoc qhp.Qt.indexTitle = Qt Reference Documentation -qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = style/style.css \ +qhp.Qt.extraFiles = index.html \ + style/style.css \ scripts/functions.js \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topcs.png \ - images/bg_11.png \ - images/bg_1_blank.png \ - images/bg_1.png \ - images/bg_1r.png \ + images/api_topics.png \ + images/bg_ll.png \ + images/bg_l_blank.png \ + images/bg_l.png \ + images/bg_lr.png \ images/bg_r.png \ images/bg_ul_blank.png \ images/bg_ul.png \ diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf index 93c5e3e..461c069 100644 --- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf @@ -29,16 +29,17 @@ 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 = style/style.css \ +qhp.Qt.extraFiles = index.html \ + style/style.css \ scripts/functions.js \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topcs.png \ - images/bg_11.png \ - images/bg_1_blank.png \ - images/bg_1.png \ - images/bg_1r.png \ + images/api_topics.png \ + images/bg_ll.png \ + images/bg_l_blank.png \ + images/bg_l.png \ + images/bg_lr.png \ images/bg_r.png \ images/bg_ul_blank.png \ images/bg_ul.png \ diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index faf3906..7449ac3 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -56,8 +56,8 @@ extraimages.HTML = qt-logo \ stylesheet-coffee-plastique.png # This stuff is used by the new doc format. -scriptdirs = $QTDIR/doc/src/template/scripts -styledirs = $QTDIR/doc/src/template/style +scriptdirs = $QT_SOURCE_TREE/doc/src/template/scripts +styledirs = $QT_SOURCE_TREE/doc/src/template/style scripts.HTML = functions.js \ jquery.js diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 91f9525..cc3e436 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -24,16 +24,17 @@ qhp.Qt.indexRoot = # Files not referenced in any qdoc file (last four are needed by qtdemo) # See also extraimages.HTML -qhp.Qt.extraFiles = style/style.css \ +qhp.Qt.extraFiles = index.html \ + style/style.css \ scripts/functions.js \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topcs.png \ - images/bg_11.png \ - images/bg_1_blank.png \ - images/bg_1.png \ - images/bg_1r.png \ + images/api_topics.png \ + images/bg_ll.png \ + images/bg_l_blank.png \ + images/bg_l.png \ + images/bg_lr.png \ images/bg_r.png \ images/bg_ul_blank.png \ images/bg_ul.png \ diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf index 925edec..c5d2c88 100644 --- a/tools/qdoc3/test/qt_zh_CN.qdocconf +++ b/tools/qdoc3/test/qt_zh_CN.qdocconf @@ -31,16 +31,17 @@ 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 = style/style.css \ +qhp.Qt.extraFiles = index.html \ + style/style.css \ scripts/functions.js \ scripts/jquery.js \ images/api_examples.png \ images/api_lookup.png \ - images/api_topcs.png \ - images/bg_11.png \ - images/bg_1_blank.png \ - images/bg_1.png \ - images/bg_1r.png \ + images/api_topics.png \ + images/bg_ll.png \ + images/bg_l_blank.png \ + images/bg_l.png \ + images/bg_lr.png \ images/bg_r.png \ images/bg_ul_blank.png \ images/bg_ul.png \ |