diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
| commit | 11632ff411c124d60c3b4f57c8a0d4a70cfb4998 (patch) | |
| tree | 1b060eb033008f6a0f6a0f19398e698b076b07f4 /src/doc/config/style/qt5-sidebar.html | |
| parent | c2a9d75aff47d024d249b4d2cedae8307a4cabbb (diff) | |
| parent | eebda51556daae681e9ddb878c36f79e497f5618 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6:
Doc: Remove generic Device Creation documentation
Conflicts:
src/doc/config/b2qt-project.qdocconf
src/doc/src/devices/qtee-bd-sl-imx6.qdoc
src/doc/src/devices/qtee-beaglebone-black.qdoc
src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
src/doc/src/devices/qtee-raspberry-pi.qdoc
src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/devices/qtee-toradex-apalis.qdoc
src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-custom-embedded-linux.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
src/doc/src/shared/detect-sd-card-device-name.qdocinc
Change-Id: I52b87c5c383c6419a35d06cb2a0c87073c9d3c85
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> |