diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-10 07:58:06 +0100 |
| commit | 015002fec9abff6a4c1bb3fa4b9de87279a079c3 (patch) | |
| tree | ad93af535a503d0a49d6c6367e990a8fbca163d3 /doc/global/qt-html-templates-online.qdocconf | |
| parent | f1e00262321cc8daa3c7506153653453e2779886 (diff) | |
| parent | b9547af45ea2bbbc634722c1ef41afdb54216ce2 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
doc/global/template/style/online.css
mkspecs/android-g++/qmake.conf
Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
Diffstat (limited to 'doc/global/qt-html-templates-online.qdocconf')
| -rw-r--r-- | doc/global/qt-html-templates-online.qdocconf | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/doc/global/qt-html-templates-online.qdocconf b/doc/global/qt-html-templates-online.qdocconf index 88abc3429b..78d0d497c8 100644 --- a/doc/global/qt-html-templates-online.qdocconf +++ b/doc/global/qt-html-templates-online.qdocconf @@ -1,23 +1,9 @@ #include standard set of HTML header and footer. include(html-config.qdocconf) include(html-header-online.qdocconf) -include(html-footer.qdocconf) +include(html-footer-online.qdocconf) #uncomment if navigation bar is not wanted #HTML.nonavigationbar = "true" -HTML.stylesheets = template/style/online.css -HTML.extraimages += template/images/ico_out.png \ - template/images/ico_note.png \ - template/images/ico_note_attention.png \ - template/images/btn_prev.png \ - template/images/btn_next.png \ - template/images/bullet_dn.png \ - template/images/bullet_sq.png \ - template/images/bgrContent.png \ - template/images/Qt-logo.png \ - template/images/Qt-dark_gradient.png \ - template/images/Qt-footer-bg.jpg \ - template/images/Qt-footer_shadow.png \ - template/images/Qt-gradient.png \ - template/images/Qt-header-bg.jpg +sourcedirs += includes-online |