summaryrefslogtreecommitdiffstats
path: root/doc/global/html-header-online.qdocconf
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-04-08 06:52:22 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-04-08 06:52:22 +0000
commit4cee9928f25926581c5bfcffeb648d89e0b232ec (patch)
treee4b3d5109b177a607c2275ed4729ea0a23e0d45c /doc/global/html-header-online.qdocconf
parent0d4232f53100eb04f8aa85ea2a7aee395baf337f (diff)
parent20cac3d9c9c22153e9e316daff32b6050ff6be6b (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'doc/global/html-header-online.qdocconf')
-rw-r--r--doc/global/html-header-online.qdocconf11
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/global/html-header-online.qdocconf b/doc/global/html-header-online.qdocconf
index b7fa9e1a65..e6dcbe19fa 100644
--- a/doc/global/html-header-online.qdocconf
+++ b/doc/global/html-header-online.qdocconf
@@ -7,7 +7,9 @@ HTML.stylesheets = template/style/online.css \
template/style/icomoon.svg \
template/style/icomoon.ttf \
template/style/icomoon.woff \
- template/style/doc_search.png
+ template/style/cookiebar-x.png \
+ template/style/doc_search.png \
+ template/style/theqtcompany.png
#for including files into the qch file. Relative to the outputdir of a QDoc build.
qhp.extraFiles += style/online.css \
@@ -16,7 +18,10 @@ qhp.extraFiles += style/online.css \
style/icomoon.eot \
style/icomoon.svg \
style/icomoon.ttf \
- style/icomoon.woff
+ style/icomoon.woff \
+ style/cookiebar-x.png \
+ style/doc_search.png \
+ style/theqtcompany.png
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/online.css\" />\n" \
@@ -116,7 +121,7 @@ HTML.postheader = \
" <ul class=\"sub-navigation\">\n" \
" <li><a href=\"http://wiki.qt.io/\">Wiki</a></li>\n" \
" <li><a href=\"http://doc.qt.io/\" class=\"active\">Documentation</a></li>\n" \
- " <li><a href=\"http://qt-project.org/forums\">Forum</a></li>\n" \
+ " <li><a href=\"http://forum.qt.io/\">Forum</a></li>\n" \
" <li><a href=\"https://bugreports.qt.io/\">Bug Reports</a></li>\n" \
" <li><a href=\"https://codereview.qt-project.org/\">Code Review</a></li>\n" \
" </ul>\n" \