summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-06-23 06:07:11 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-06-23 06:07:11 (GMT)
commit6d7120dc2081e10c46ffe8467b047affe81ed747 (patch)
treec454785971f36b8cab970f919d6a89c03685a260 /tools
parentb418419f23cec0880b6b351d304b1a755f82ab73 (diff)
parentdd792c28d89fbdc23de0d40143f0ca900c6c4daa (diff)
downloadQt-6d7120dc2081e10c46ffe8467b047affe81ed747.zip
Qt-6d7120dc2081e10c46ffe8467b047affe81ed747.tar.gz
Qt-6d7120dc2081e10c46ffe8467b047affe81ed747.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf1
-rw-r--r--tools/qdoc3/test/qt.qdocconf1
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 6e0253a..d427a86 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -29,7 +29,6 @@ qhp.Qt.indexRoot =
# See also extraimages.HTML
qhp.Qt.extraFiles = classic.css \
images/qt-logo.png \
- images/trolltech-logo \
images/taskmenuextension-example.png \
images/coloreditorfactoryimage.png \
images/dynamiclayouts-example.png \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index e1ce8d3..9c43b4f 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -31,7 +31,6 @@ qhp.Qt.indexRoot =
# See also extraimages.HTML
qhp.Qt.extraFiles = classic.css \
images/qt-logo.png \
- images/trolltech-logo \
images/taskmenuextension-example.png \
images/coloreditorfactoryimage.png \
images/dynamiclayouts-example.png \