summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 17:17:35 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 17:17:35 +0200
commit0ed2d865900312d3e85886c5e36867e633179a83 (patch)
tree4f285903c3667d3dc5262541dc4131c49a82ab22 /tools
parent3772d559f7e19189ceeac1094f7526176681ba1c (diff)
parenta60259b676743f078178185a6c587381bd957d3c (diff)
downloadqt4-tools-0ed2d865900312d3e85886c5e36867e633179a83.tar.gz
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
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 3fbeb4463b..77b03d20b3 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 1ec9b72f3c..d154254f7e 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 \