diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-31 10:03:31 +0200 |
| commit | ce9519593a0b3deb99d1dd2529770f7e9fffef92 (patch) | |
| tree | c9bca05230dd68f49494240ae930bad1fe0c5956 /doc/global/html-header-online.qdocconf | |
| parent | 509f77cca28aa3edea5523c5869bae4412ed2ccc (diff) | |
| parent | 7baaec17edb06634f1d6235a55c7adbd112cba3e (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
mkspecs/android-g++/qmake.conf
qmake/generators/unix/unixmake2.cpp
src/gui/image/qimage_conversions.cpp
Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
Diffstat (limited to 'doc/global/html-header-online.qdocconf')
| -rw-r--r-- | doc/global/html-header-online.qdocconf | 11 |
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" \ |