diff options
Diffstat (limited to 'src/doc')
-rw-r--r-- | src/doc/config/b2qt-project.qdocconf | 14 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-architech-tibidabo.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-bd-sl-imx6.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-beaglebone-black.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-raspberry-pi.qdoc | 19 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-sabre-sd-imx6.qdoc | 4 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-supported-devices.qdoc | 36 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-toradex-apalis.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-toradex-colibri-vf.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/qtee-changelog.qdoc | 11 | ||||
-rw-r--r-- | src/doc/src/qtee-custom-embedded-linux.qdoc | 11 | ||||
-rw-r--r-- | src/doc/src/qtee-index.qdoc | 4 |
12 files changed, 66 insertions, 43 deletions
diff --git a/src/doc/config/b2qt-project.qdocconf b/src/doc/config/b2qt-project.qdocconf index 471096e..5983ca2 100644 --- a/src/doc/config/b2qt-project.qdocconf +++ b/src/doc/config/b2qt-project.qdocconf @@ -1,6 +1,6 @@ project = QtForDeviceCreation -description = Qt 5.4 for Device Creation -version = 4.1.0 +description = Qt 5.5 for Device Creation +version = 5.5.0 sourcedirs += ../src \ ../../imports/wifi \ @@ -24,14 +24,14 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.410 +qhp.B2Qt.namespace = com.digia.b2qt.550 qhp.B2Qt.virtualFolder = b2qt -qhp.B2Qt.indexTitle = Qt 5.4 for Device Creation +qhp.B2Qt.indexTitle = Qt 5.5 for Device Creation qhp.B2Qt.indexRoot = qhp.B2Qt.subprojects = manual -qhp.B2Qt.subprojects.manual.title = Qt 5.4 for Device Creation -qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.4 for Device Creation +qhp.B2Qt.subprojects.manual.title = Qt 5.5 for Device Creation +qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.5 for Device Creation qhp.B2Qt.subprojects.manual.type = manual macro.B2Q = "Boot to Qt" @@ -39,7 +39,7 @@ macro.SDK = "Qt for Device Creation" macro.B2QA = "\\e {Boot to Qt for embedded Android}" macro.B2QL = "\\e {Boot to Qt for embedded Linux}" -navigation.landingpage = "Qt 5.4 for Device Creation" +navigation.landingpage = "Qt 5.5 for Device Creation" navigation.qmltypespage = "Add-On Modules" Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY diff --git a/src/doc/src/devices/qtee-architech-tibidabo.qdoc b/src/doc/src/devices/qtee-architech-tibidabo.qdoc index a8b8214..87d070a 100644 --- a/src/doc/src/devices/qtee-architech-tibidabo.qdoc +++ b/src/doc/src/devices/qtee-architech-tibidabo.qdoc @@ -49,7 +49,7 @@ \badcode cd <INSTALL_DIR> - sudo ./Boot2Qt-4.x/tibidabo-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/tibidabo-eLinux/images/deploy.sh /dev/<device_name> \endcode After the installation is complete, insert the SD card, power on the device and check that diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc index 68f32cd..2b68a28 100644 --- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc +++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc @@ -67,7 +67,7 @@ \badcode cd <INSTALL_DIR> - sudo ./Boot2Qt-4.x/iMX6-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/iMX6-eLinux/images/deploy.sh /dev/<device_name> \endcode After the installation is complete, insert the SD card, power on the device and check that diff --git a/src/doc/src/devices/qtee-beaglebone-black.qdoc b/src/doc/src/devices/qtee-beaglebone-black.qdoc index ea7d745..dc9dce9 100644 --- a/src/doc/src/devices/qtee-beaglebone-black.qdoc +++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc @@ -49,7 +49,7 @@ \badcode cd <INSTALL_DIR> - sudo ./Boot2Qt-4.x/beaglebone-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/beaglebone-eLinux/images/deploy.sh /dev/<device_name> \endcode After the installation is complete, insert the SD card, power on the device and check that diff --git a/src/doc/src/devices/qtee-raspberry-pi.qdoc b/src/doc/src/devices/qtee-raspberry-pi.qdoc index 60fb6af..4340065 100644 --- a/src/doc/src/devices/qtee-raspberry-pi.qdoc +++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc @@ -17,24 +17,19 @@ ** ****************************************************************************/ /*! - \target Raspberry Pi Model B (embedded Linux) + \target Raspberry Pi 2 Model B (embedded Linux) \page qtee-preparing-hardware-rasberrypi.html - \title Preparing Raspberry Pi + \title Preparing Raspberry Pi 2 \previouspage qtee-installation-guide.html \nextpage qtee-building-and-running.html - Take the following steps to prepare a \l{http://www.raspberrypi.org/} - {Raspberry Pi} for - \B2Q. - - \note Ethernet networking is required to connect the device to Qt Creator. - This means that the support is currently limited to Raspberry Pi Model B, which - includes an Ethernet port. + Take the following steps to prepare a \l{https://www.raspberrypi.org/products/raspberry-pi-2-model-b/} + {Raspberry Pi 2} for \B2Q. \note It is important that you repeat the steps in this section after you update \SDK. - The image containing \B2Q stack for Raspberry Pi is included in the SDK, + The image containing \B2Q stack for Raspberry Pi 2 is included in the SDK, ready to be copied to an SD card. \section1 Preparing an SD Card @@ -52,11 +47,11 @@ \include detect-sd-card-device-name.qdocinc unmount - Then, + Then, enter the following command to deploy the image: \badcode cd <INSTALL_DIR> - sudo Boot2Qt-4.x/raspberrypi-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/raspberrypi2-eLinux/images/deploy.sh /dev/<device_name> \endcode After the image has been deployed, insert the SD card, power on the device and check that diff --git a/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc b/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc index a0a9d24..819da9f 100644 --- a/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc +++ b/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc @@ -56,7 +56,7 @@ \badcode cd <INSTALL_DIR> - sudo Boot2Qt-4.x/imx6qsabresd-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/imx6qsabresd-eLinux/images/deploy.sh /dev/<device_name> \endcode To deploy the image on \b {i.MX6Dual}, you need to enter an additional boot @@ -64,7 +64,7 @@ \badcode cd <INSTALL_DIR> - sudo Boot2Qt-4.x/imx6qsabresd-eLinux/images/deploy.sh --uboot u-boot-imx6dlsabresd.imx /dev/<device_name> + sudo 5.5/Boot2Qt/imx6qsabresd-eLinux/images/deploy.sh --uboot u-boot-imx6dlsabresd.imx /dev/<device_name> \endcode After the image has been deployed, insert the SD card, power on the device and check that diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index c11fd73..d955133 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -35,7 +35,7 @@ \li \l{Toradex Colibri VF50 and VF61 (embedded Linux)} \li \l{ArchiTech Tibidabo (embedded Linux)} \li \l{BeagleBone Black (embedded Linux)} - \li \l{Raspberry Pi Model B (embedded Linux)} + \li \l{Raspberry Pi 2 Model B (embedded Linux)} \endlist If you use only the emulator, you can skip this step @@ -66,6 +66,20 @@ * On GPU-less hardware, \l {Qt Quick 2D Renderer} can replace the OpenGL ES 2.0 requirement (with some limitations on graphics capabilities). + \section1 Support Lifecycle Policy + + The Qt Company will continue providing support for this release of \SDK + two years after the release date of a version that supercedes it. + + Release dates and support end-of-life dates for each version are listed + in the ChangeLog. + + \section2 Emulator Support + + Support for the emulator is limited to the \SDK release and pre-compiled + emulator images it shipped with. Using the emulator application to run + images from previous releases is not supported. + \section1 Supported Device Groups The reference devices are divided into three groups, based on level @@ -139,10 +153,10 @@ Freescale® i.MX 6Q ARM Cortex™-A9 @1 GHz,\br 1GB DDR3, 4GB eMMC, Vivante GC2000 GPU \li \image ok - \row \li \l{http://www.raspberrypi.org/faqs} - {Raspberry Pi Model B}\br - 700 Mhz ARM11, Broadcom videocode IV\br - @250MHz GPU, 512 MB (shared with GPU) RAM + \row \li \l{https://www.raspberrypi.org/products/raspberry-pi-2-model-b/} + {Raspberry Pi 2 Model B}\br + 900 Mhz ARM Cortex™-A7, Broadcom VideoCore IV\br + @250MHz GPU, 1GB LPDDR2 SDRAM \li \image ok \endtable @@ -156,24 +170,26 @@ The Qt Company for consultancy services. \table - \header \li Device \li eLinux \li Notes + \header \li Device \li eLinux \row \li \l{http://beagleboard.org/hardware-xM} {BeagleBoard-xM}\br 1GHz ARM Cortex A8, PowerVR SGX530 GPU,\br 512MB RAM \li \image ok - \li \row \li \l{http://processors.wiki.ti.com/index.php/AM335x_Starter_Kit} {Sitara AM335x Starter Kit}\br 720 MHZ ARM Cortex™-A8 Starter Kit\br with 4.3-inch LCD touchscreen \li \image ok - \li \row \li \l{http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX53QSB} {Freescale® iMX53 Quick Start Board}\br 1GHz ARM Cortex™-A8 \li \image ok - \li + \row \li \l{https://www.raspberrypi.org/products/model-b/} + {Raspberry Pi Model B}\br + 700 Mhz ARM11, Broadcom VideoCore IV\br + @250MHz GPU, 512 MB (shared with GPU) RAM + \li \image ok \endtable \section2 Supported Features on Reference Devices @@ -273,7 +289,7 @@ \li \image ok \li \image ok \li - \row \li Raspberry Pi Model B + \row \li Raspberry Pi 2 \li \image ok \li \image ok \li diff --git a/src/doc/src/devices/qtee-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc index 5a9d7bb..8d04b6e 100644 --- a/src/doc/src/devices/qtee-toradex-apalis.qdoc +++ b/src/doc/src/devices/qtee-toradex-apalis.qdoc @@ -51,7 +51,7 @@ \badcode cd <INSTALL_DIR> - sudo Boot2Qt-4.x/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name> \endcode By default, the Toradex Apalis iMX6 boots from its internal eMMC. In order to boot from diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc index 5753256..7329fbf 100644 --- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc +++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc @@ -53,7 +53,7 @@ \badcode cd <INSTALL_DIR> - sudo Boot2Qt-4.x/colibri-vf-eLinux/images/deploy.sh /dev/<device_name> + sudo 5.5/Boot2Qt/colibri-vf-eLinux/images/deploy.sh /dev/<device_name> \endcode By default, the Toradex Colibri VF devices boot from their internal NAND memory. In order to boot from diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc index bfaa919..55c9b3b 100644 --- a/src/doc/src/qtee-changelog.qdoc +++ b/src/doc/src/qtee-changelog.qdoc @@ -49,6 +49,7 @@ \section1 \B2Q 4.1.0 \list \li Release date: Feb 24, 2015 + \li Supported until: Jun 02, 2017 \endlist \section2 Changes @@ -78,6 +79,7 @@ \section1 \B2Q 4.0.0 \list \li Release date: Dec 10, 2014 + \li Supported until: Feb 19, 2017 \endlist \section2 Changes @@ -131,6 +133,7 @@ \list \li Release date: Oct 14, 2014 + \li Supported until: Dec 10, 2016 \endlist \section2 Changes @@ -172,6 +175,7 @@ \list \li Release date: Aug 20, 2014 + \li Supported until: Oct 14, 2016 \endlist \section2 Changes @@ -184,7 +188,8 @@ \section1 \B2Q 3.1.0 \list - \li Release date: July 3, 2014 + \li Release date: July 03, 2014 + \li Supported until: Aug 20, 2016 \endlist \section2 Changes @@ -226,6 +231,7 @@ \list \li Release date: May 22, 2014 + \li Supported until: July 03, 2016 \endlist \section2 Changes @@ -262,6 +268,7 @@ \list \li Release date: Apr. 15, 2014 + \li Supported until: May 22, 2016 \endlist \section2 Changes @@ -316,6 +323,7 @@ \list \li Release date: Feb. 25, 2014 + \li Supported until: Apr. 15, 2016 \endlist \section2 Changes @@ -366,6 +374,7 @@ \list \li Release date: Dec. 5, 2013 + \li Supported until: Feb. 25, 2016 \endlist \section2 Changes diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index 2da45cf..0c730c1 100644 --- a/src/doc/src/qtee-custom-embedded-linux.qdoc +++ b/src/doc/src/qtee-custom-embedded-linux.qdoc @@ -68,7 +68,7 @@ \badcode cd <BuildDir> - <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-yocto-meta/b2qt-init-build-env init --device raspberrypi + <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env init --device raspberrypi \endcode \c b2qt-init-build-env has the following additional command line options: @@ -81,7 +81,7 @@ For all command line options, see: \badcode - <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-yocto-meta/b2qt-init-build-env help + <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env help \endcode \section1 Building the Image and Toolchain @@ -105,6 +105,9 @@ \li Raspberry Pi \li raspberrypi \row + \li Raspberry Pi 2 + \li raspberrypi2 + \row \li BeagleBone Black \li beaglebone \row @@ -153,7 +156,7 @@ script. Using Raspberry Pi as an example: \badcode - <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-linux/config.raspberrypi + <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-build-scripts/embedded-linux/config.raspberrypi \endcode \note You can use the same build directory for Qt and the Yocto image. @@ -178,7 +181,7 @@ developing for your device. The following script does this for you. \badcode - <INSTALL_DIR>/Boot2Qt-4.x/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh + <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh \endcode This will set up a new kit in Qt Creator, using the toolchain and Qt from diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index 64635d7..4d571fd 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -20,7 +20,7 @@ /*! \page index.html \nextpage qtee-overview.html - \title Qt 5.4 for Device Creation + \title Qt 5.5 for Device Creation \e {Qt for Device Creation} is a commercial offering, providing a fully-integrated solution for creating embedded Linux-based products. It @@ -50,7 +50,7 @@ \li \l{Preparing Toradex Colibri VF50 and VF61}{Toradex Colibri VF50 and VF61 (embedded Linux)} \li \l{Preparing ArchiTech Tibidabo}{ArchiTech Tibidabo (embedded Linux)} \li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Linux)} - \li \l{Preparing Raspberry Pi}{Raspberry Pi Model B (embedded Linux)} + \li \l{Preparing Raspberry Pi 2}{Raspberry Pi 2 Model B (embedded Linux)} \endlist \li \l{Building and Running Embedded Applications} \list |