summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-06-22 23:18:10 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-06-22 23:18:10 (GMT)
commitc7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f (patch)
tree836c2dacbfa3d55c07ab8242f57efd79e3deeeec /tools/qdoc3
parent631351d8b5699520267a80599a57e27f97b53d23 (diff)
parent308ed3913b406c43dfdab4fa734a332863dc4cbc (diff)
downloadQt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.zip
Qt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.tar.gz
Qt-c7fcd4b772092cf0764cfd97463c3aa3d7cc9e9f.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tools/qdoc3')
-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 \