summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-12-20 14:46:05 +1000
committerJason McDonald <jason.mcdonald@nokia.com>2011-12-28 01:29:13 +0100
commit22b79f861eb6f6107d635ebc1ee68d1819b53ef3 (patch)
tree61a3de6b26fb369131ecfb7689043e80b26a7fb2
parent38695445fd87507b9292435bebbe7eae26bf5c1e (diff)
Remove trolltech-logo.png.
This file contained the old Trolltech logo. Make the docs use the Qt logo instead. Task-number: QTBUG-19653 Change-Id: If547114113ae2114524d1d781991c092f37a8215 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r--doc/qlalr.qdocconf5
-rw-r--r--doc/src/images/trolltech-logo.pngbin1512 -> 0 bytes
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/qlalr.qdocconf b/doc/qlalr.qdocconf
index f5af331..3456a8c 100644
--- a/doc/qlalr.qdocconf
+++ b/doc/qlalr.qdocconf
@@ -15,8 +15,7 @@ exampledirs = ../examples
imagedirs = src/images
outputdir = html
codeindent = 1
-extraimages.HTML = qt-logo \
- trolltech-logo
+extraimages.HTML = qt-logo
macro.key = "\\bold"
macro.menu = "\\bold"
@@ -55,7 +54,7 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0
" <a href=\"functions.html\">" \
"<font color=\"#004faf\">Functions</font></a>" \
"</td>\n" \
- "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qt.nokia.com\"><img src=\"images/trolltech-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
+ "<td align=\"right\" valign=\"top\" width=\"230\"><a href=\"http://qt.nokia.com\"><img src=\"images/qt-logo.png\" align=\"right\" width=\"203\" height=\"32\" border=\"0\" /></a></td></tr></table>"
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
diff --git a/doc/src/images/trolltech-logo.png b/doc/src/images/trolltech-logo.png
deleted file mode 100644
index 19e3789..0000000
--- a/doc/src/images/trolltech-logo.png
+++ /dev/null
Binary files differ