summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-04-15 18:30:12 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-04-15 18:30:12 (GMT)
commit5b975e1dc61eaee055afc40fef13358bcd55c7d2 (patch)
tree4bce81035d9cfe100ca0e2a21f9c82bbfd7a9e02 /tools
parente4282111378ce67a1ae9c235efbd89b327f1bb91 (diff)
downloadQt-5b975e1dc61eaee055afc40fef13358bcd55c7d2.zip
Qt-5b975e1dc61eaee055afc40fef13358bcd55c7d2.tar.gz
Qt-5b975e1dc61eaee055afc40fef13358bcd55c7d2.tar.bz2
qdoc: Added the index and fixed images in the extra files list.
Reviewed-by: Trust Me
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf14
-rw-r--r--tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf13
-rw-r--r--tools/qdoc3/test/qt-defines.qdocconf4
-rw-r--r--tools/qdoc3/test/qt.qdocconf13
-rw-r--r--tools/qdoc3/test/qt_zh_CN.qdocconf13
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 \