diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:27 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:38 +0300 |
| commit | d757a8ee2d86c3f4b694f8fdff5defa7b0dbab75 (patch) | |
| tree | 27b30b37643ebfe4615d7eb645b72cd42a4316cb /doc/html-offline.qdocconf | |
| parent | 80c1335ec02c038329603486315d06d7bddc1326 (diff) | |
| parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) | |
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable: (21 commits)
Revert "Show PieMenu in enterprise controls list view."
Show PieMenu in enterprise controls list view.
Fix PieMenu not showing in enterprise-gallery launcher demo.
Update enterprise controls demos to version 1.1
Revert "Add input field for decimal numbers"
Doc: Update documentation version to 2.1.0
[launchersettings] Fix UI scaling
[about-b2qt] Use Screen element for setting width/height
Change default font for demos to support arabic numbers
[launchersettings] Small fixes in wifi settings section
sensorexplorer: Use identifier field when description is empty
Make sensors demo not rely on measurement errors
Doc: Update screenshot for the textinput demo
Remove incorrect assingment of QUrl to bool
qt5-everywhere: update working radio playlist
Show launchersettings and sensors demos in QtCreator
Doc: Switch to use the global Qt template for example docs
Updated preview_l.jpg for textinput demo
Rearrange the order of demos in the launcher
Merge updates from upstream into keyboard example
...
Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd
Diffstat (limited to 'doc/html-offline.qdocconf')
| -rw-r--r-- | doc/html-offline.qdocconf | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/doc/html-offline.qdocconf b/doc/html-offline.qdocconf index bef6912..1488996 100644 --- a/doc/html-offline.qdocconf +++ b/doc/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" \ |