diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-13 15:58:52 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-01-13 15:59:46 +0200 |
| commit | 6217a1cae7e0f5fcfa93d80051237fa835412903 (patch) | |
| tree | 2f2d93b8aa0160c00e323da24636e91455d0b155 /src/doc/src/qtee-index.qdoc | |
| parent | 9bad5168e006b37e5b1634ac68085b587846febb (diff) | |
| parent | 1145b7fe7db9dc2ae216aa90d4c99473a25a838e (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
* origin/5.5:
docs: add note about need for kontron's Yocto BSP
Doc: Bump version to 5.5.1
Doc: Add ChangeLog for 5.5.1
doc: add documentation for Kontron SMARC-sAMX6i
Doc: Add a custom note on the online landing page
doc: instructions how to use BD's 1280x800 panels
Doc: Clarify the network type for Emulator
Conflicts:
src/doc/config/b2qt-project.qdocconf
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/qtee-index.qdoc
Change-Id: I912a1175965a44c5ff5d68ca5ea9be2d6928b595
Diffstat (limited to 'src/doc/src/qtee-index.qdoc')
| -rw-r--r-- | src/doc/src/qtee-index.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index 2f9f9e8..edec7bb 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -22,6 +22,7 @@ \nextpage qtee-overview.html \title Qt 5.6 for Device Creation + \welcome \e {Qt for Device Creation} is a commercial offering, providing a fully-integrated solution for creating embedded Linux-based products. It provides the complete toolchain required for faster software development, @@ -49,6 +50,7 @@ \li \l{Preparing Toradex Colibri iMX6}{Toradex Colibri iMX6} \li \l{Preparing Toradex Colibri VF50 and VF61}{Toradex Colibri VF50 and VF61} \li \l{Preparing ArchiTech Tibidabo}{ArchiTech Tibidabo} + \li \l{Preparing Kontron SMARC-sAMX6i}{Kontron SMARC-sAMX6i} \li \l{Preparing BeagleBone Black}{BeagleBone Black} \li \l{Preparing Raspberry Pi 2}{Raspberry Pi 2 Model B} \endlist |