diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:24:09 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-21 12:27:37 +0200 |
| commit | 436af494659d416cfbd531b8d3ba9fc49e2fa710 (patch) | |
| tree | ab5e6b48e711a3c3a2e2cd4399ce1b3d34347406 /src/doc/config/html-offline.qdocconf | |
| parent | a10b8b669d357325e9f0b735bcda42758ad2b3d0 (diff) | |
| parent | 4738811e35a559d238ba20703eb792fca8f5756b (diff) | |
Merge branch 'stable' into releaseQtEE_v2.0.0
* stable: (90 commits)
Doc: Document support services for Yocto recipes
doc: minor changes to customization inline code blocks
Doc: Clarify which Qt Creator templates work out of the box
Doc: Fix missing sudo for i.MX6 embedded Linux deployment
Doc: Fixed 32bit package install command for newer ubuntu versions
doc: add quide how to use b2qt_build_scripts
Doc: Add instructions how to install newer VirtualBox
[Wifi] Fix initialization code
Doc: Explain about disabling surfaceflinger
Enable internet on eAndroid emulator
Doc: Add instructions for building Boot2Qt demos
Doc: Troubleshooting entry for BeagleBone Black HDMI issues
Don't use wifi on Emulator
Doc: Document building your own embedded linux stack
Update copyright year
Doc: Fix the 2.0 release date
Doc: ChangeLog: Remove 'black screen after exit' from bugfixes
Doc: Use a global Qt documentation template
Doc: Add changelog
Disable QConnectivity daemon on emulator
...
Change-Id: I25ba7e19677c3d91d5e78ab68291296face3c073
Diffstat (limited to 'src/doc/config/html-offline.qdocconf')
| -rw-r--r-- | src/doc/config/html-offline.qdocconf | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index cd95334..29a5613 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -1,36 +1,7 @@ -HTML.nobreadcrumbs = "true" - -HTML.stylesheets = template/style/offline.css - -# Copy images used by the template to images folder in output directory -HTML.extraimages = template/images/bgrContent.png \ - template/images/blu_dot.png \ - template/images/btn_next.png \ - template/images/btn_prev.png \ - template/images/ico_note.png \ - template/images/ico_note_attention.png \ - template/images/ico_out.png \ - template/images/arrow_bc.png \ - template/images/home.png +# use the global Qt template with modifications to the html footer +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -# Add style-related files into qch package -qhp.extraFiles += style/offline.css \ - images/bgrContent.png \ - images/blu_dot.png \ - images/btn_next.png \ - images/btn_prev.png \ - images/ico_note.png \ - images/ico_note_attention.png \ - images/ico_out.png \ - images/home.png \ - images/arrow_bc.png - -HTML.headerstyles = \ - " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n" - -HTML.endheader = \ - "</head>\n" \ - "<body>\n" +HTML.nobreadcrumbs = "true" HTML.footer = \ " <div class=\"ft\">\n" \ @@ -39,7 +10,7 @@ HTML.footer = \ "</div> \n" \ "<div class=\"footer\">\n" \ " <p>\n" \ - " <acronym title=\"Copyright\">©</acronym> 2013 Digia Plc and/or its\n" \ + " <acronym title=\"Copyright\">©</acronym> 2014 Digia Plc and/or its\n" \ " subsidiaries.</p>\n" \ " <p>\n" \ " Licensees holding valid Qt Commercial licenses may use this document in\n" \ @@ -50,5 +21,5 @@ HTML.footer = \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://en.gitorious.org/privacy_policy/\">Privacy Policy</a></p>\n" \ + " href=\"http://qt.digia.com/Digia-Legal-Notice--Privacy-Policy/\">Privacy Policy</a></p>\n" \ "</div>\n" |