diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
commit | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (patch) | |
tree | 35c238f57be475e69abd3e34baa32a136739dfd5 /src/doc/config/style/qt5-sidebar.html | |
parent | f6de3a059ea2207104ff8f23718d714ac4ff41d2 (diff) | |
parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
* origin/5.7:
Doc: Document QtDeviceUtilities
Doc: Remove rest of the generic Qt for Device Creation doc files
Doc: Bump version to 5.7.1
Doc: Remove generic Device Creation documentation
Added additional instructions for Windows users using BeagleBone Black
Fixes to networkSettingsService model handling
Updated icons
Doc: Add documentation for NVIDIA DRIVE CX
Doc: Add documentation for Intel NUC
Doc: Remove references to SILICA ArchiTech Tibidabo
Doc: Bump version to 5.7.0
Fixed connman backend crashes and changed it as default.
Conflicts:
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
Change-Id: Idb13f9fd130211213434576ab5cc3d38766e9711
Diffstat (limited to 'src/doc/config/style/qt5-sidebar.html')
-rw-r--r-- | src/doc/config/style/qt5-sidebar.html | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/doc/config/style/qt5-sidebar.html b/src/doc/config/style/qt5-sidebar.html index 5f0660c..3879827 100644 --- a/src/doc/config/style/qt5-sidebar.html +++ b/src/doc/config/style/qt5-sidebar.html @@ -1,28 +1,16 @@ <div class="sectionlist normallist"> <div class="heading"> - <h2>Qt for Device Creation</h2> + <h2>Qt Device Utilities</h2> </div> <ul> - <li><a href="index.html">Home</a></li> - <li><a href="qtee-overview.html">Overview</a></li> - <li><a href="qtee-about-b2qt.html">Boot to Qt</a></li> - <li><a href="qtee-installation-guide.html">Installation Guide</a></li> - <li><a href="qtee-supported-platforms.html">Supported Platforms</a></li> - <li><a href="qtee-preparing-hardware.html">Preparing Hardware</a></li> - <li><a href="qtee-building-and-running.html">Building and Running</a></li> - <li><a href="qtee-customization.html">Customization</a></li> - <li><a href="qtee-custom-embedded-linux-image.html">Custom Embedded Linux Images</a></li> - <li><a href="qtee-changelog.html">ChangeLog</a></li> - <li><a href="qtee-troubleshooting.html">Troubleshooting</a></li> - <li><a href="qtee-known-issues.html">Known Issues</a></li> - <li><a href="qtee-licenses.html">License Information</a></li> + <li><a href="qtee-module-reference.html">Home</a></li> </ul> </div> <div class="sectionlist normallist"> <div class="heading"> - <h2>Reference</h2> + <h2>See Also</h2> </div> <ul> - <li><a href="qtee-module-reference.html">Add-On Modules</a></li> + <li><a href="https://doc.qt.io/QtForDeviceCreation">Qt for Device Creation</a></li> </ul> </div> |