summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-10-19 13:26:35 +0200
committerTopi Reinio <topi.reinio@qt.io>2021-12-11 14:31:33 +0100
commitd3ecedc2ccb228f9d125ab4870cf1a36b60fc012 (patch)
tree6cfcd556c63dcba95ade3a9a29c79aa882b7d44f /doc
parente655f44896ab1a25bf0864174e14bd257323d483 (diff)
downloadqtapplicationmanager-d3ecedc2ccb228f9d125ab4870cf1a36b60fc012.tar.gz
Doc: Fix online documentation build
Select the correct documentation template if QT_BUILD_ONLINE_DOCS is set, and add a sidebar for the online doc set. Pick-to: 6.2 Change-Id: I2f7761a364e2a4cf55a4a0b6a4f9bb5f61fae3cf Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/online/qtapplicationmanager.qdocconf25
-rw-r--r--doc/online/style/qt5-sidebar.html42
2 files changed, 44 insertions, 23 deletions
diff --git a/doc/online/qtapplicationmanager.qdocconf b/doc/online/qtapplicationmanager.qdocconf
index 26b95860..25763fea 100644
--- a/doc/online/qtapplicationmanager.qdocconf
+++ b/doc/online/qtapplicationmanager.qdocconf
@@ -1,26 +1,5 @@
include($QT_INSTALL_DOCS/global/qt-module-defaults-online.qdocconf)
-
-HTML.footer = \
- " </div>\n" \
- " <p class=\"copy-notice\">\n" \
- " <acronym title=\"Copyright\">&copy;</acronym> 2019 Luxoft Sweden AB.\n" \
- " Documentation contributions included herein are the copyrights of\n" \
- " their respective owners. " \
- " The documentation provided herein is licensed under the terms of the" \
- " <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU Free Documentation" \
- " License version 1.3</a> as published by the Free Software Foundation. " \
- " Qt and respective logos are trademarks of The Qt Company Ltd. " \
- " in Finland and/or other countries worldwide. All other trademarks are property\n" \
- " of their respective owners. </p>\n"
-
-# online site footer
-include($QT_INSTALL_DOCS/global/html-footer-online.qdocconf)
+include(../qtapplicationmanager-project.qdocconf)
# Add an .html file with sidebar content, used in the online style
-# HTML.stylesheets += style/qt5-sidebar.html
-
-# override defaults for Qt module documentation
-HTML.nosubdirs = "false"
-HTML.outputsubdir = "applicationmanager"
-
-include(../qtapplicationmanager-project.qdocconf)
+HTML.stylesheets += style/qt5-sidebar.html
diff --git a/doc/online/style/qt5-sidebar.html b/doc/online/style/qt5-sidebar.html
new file mode 100644
index 00000000..d228b696
--- /dev/null
+++ b/doc/online/style/qt5-sidebar.html
@@ -0,0 +1,42 @@
+<div class="sectionlist normallist">
+ <div class="heading">
+ <h2>Qt Application Manager</h2>
+ </div>
+ <ul>
+ <li><a href="index.html">Overview</a></li>
+ <li><a href="introduction.html">Introduction</a></li>
+ <li><a href="installation.html">Installation</a></li>
+ <li><a href="configuration.html">Configuration</a></li>
+ <li><a href="containers.html">Containers</a></li>
+ <li><a href="intents.html">Intents</a></li>
+ <li><a href="system-ui.html">System UI</a></li>
+ <li><a href="howto-apps.html">Writing Applications</a></li>
+ <li><a href="debugging.html">Logging and Debugging</a></li>
+ <li><a href="singlevsmultiprocess.html">Single-Process vs. Multi-Process</a></li>
+ <li><a href="use-qt-resources.html">Using Qt Resources</a></li>
+ <li><a href="migration-guide-6-2.html">Migration Guide</a></li>
+ <li><a href="troubleshoot.html">Troubleshooting</a></li>
+ <li><a href="index.html#examples">Examples</a></li>
+ </ul>
+</div>
+<div class="sectionlist normallist">
+ <div class="heading">
+ <h2>Tools</h2>
+ </div>
+ <ul>
+ <li><a href="appman-controller.html">Controller</a></li>
+ <li><a href="installer.html">Package Installer</a></li>
+ <li><a href="appman-packager.html">Packager</a></li>
+ </ul>
+</div>
+<div class="sectionlist normallist">
+ <div class="heading">
+ <h2>Reference</h2>
+ </div>
+ <ul>
+ <li><a href="manifest.html">Manifest Definition</a></li>
+ <li><a href="qml-common.html">QtApplicationManager</a></li>
+ <li><a href="qml-sysui.html">SystemUI</a></li>
+ <li><a href="qml-apps.html">Application</a></li>
+ </ul>
+</div>