diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/doc/config/b2qt-project.qdocconf | 16 | ||||
-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 | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-sabre-sd-imx6.qdoc | 4 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-toradex-apalis.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/devices/qtee-toradex-colibri-vf.qdoc | 2 | ||||
-rw-r--r-- | src/doc/src/qtee-custom-embedded-linux.qdoc | 8 | ||||
-rw-r--r-- | src/doc/src/qtee-index.qdoc | 2 |
11 files changed, 22 insertions, 22 deletions
diff --git a/src/doc/config/b2qt-project.qdocconf b/src/doc/config/b2qt-project.qdocconf index 664711a..753340b 100644 --- a/src/doc/config/b2qt-project.qdocconf +++ b/src/doc/config/b2qt-project.qdocconf @@ -1,6 +1,6 @@ project = QtForDeviceCreation -description = Qt 5.5 for Device Creation -version = 5.5.0 +description = Qt 5.6 for Device Creation +version = 5.6.0 sourcedirs += ../src \ ../../imports/wifi \ @@ -9,7 +9,7 @@ sourcedirs += ../src \ headerdirs += ../../wifi -exampledirs += ../../../examples +exampledirs += ../../../examples imagedirs += ../images @@ -29,14 +29,14 @@ depends = qmake qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.550 +qhp.B2Qt.namespace = com.digia.b2qt.560 qhp.B2Qt.virtualFolder = b2qt -qhp.B2Qt.indexTitle = Qt 5.5 for Device Creation +qhp.B2Qt.indexTitle = Qt 5.6 for Device Creation qhp.B2Qt.indexRoot = qhp.B2Qt.subprojects = manual -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.title = Qt 5.6 for Device Creation +qhp.B2Qt.subprojects.manual.indexTitle = Qt 5.6 for Device Creation qhp.B2Qt.subprojects.manual.type = manual macro.B2Q = "Boot to Qt" @@ -44,7 +44,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.5 for Device Creation" +navigation.landingpage = "Qt 5.6 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 87d070a..a94f04d 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 5.5/Boot2Qt/tibidabo-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/tibidabo/images/b2qt-embedded-qt5-image-tibidabo.img of=/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 17d5796..e46882a 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 5.5/Boot2Qt/nitrogen6x-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/nitrogen6x/images/b2qt-embedded-qt5-image-nitrogen6x.img of=/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 dc9dce9..cbc8887 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 5.5/Boot2Qt/beaglebone-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/beaglebone/images/b2qt-embedded-qt5-image-beaglebone.img of=/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 4340065..c99c472 100644 --- a/src/doc/src/devices/qtee-raspberry-pi.qdoc +++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc @@ -51,7 +51,7 @@ \badcode cd <INSTALL_DIR> - sudo 5.5/Boot2Qt/raspberrypi2-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/raspberrypi2/images/b2qt-embedded-qt5-image-raspberrypi2.img of=/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 819da9f..a50817d 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 5.5/Boot2Qt/imx6qsabresd-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/imx6qsabresd/images/b2qt-embedded-qt5-image-imx6qsabresd.img of=/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 5.5/Boot2Qt/imx6qsabresd-eLinux/images/deploy.sh --uboot u-boot-imx6dlsabresd.imx /dev/<device_name> + sudo 5.6/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-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc index 8d04b6e..220d5e5 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 5.5/Boot2Qt/apalis-imx6-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/apalis-imx6/images/b2qt-embedded-qt5-image-apalis-imx6.img of=/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-imx6.qdoc b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc index 475a05e..5b28425 100644 --- a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc +++ b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc @@ -51,7 +51,7 @@ \badcode cd <INSTALL_DIR> - sudo 5.5/Boot2Qt/colibri-imx6-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/colibri-imx6/images/b2qt-embedded-qt5-image-colibri-imx6.img of=/dev/<device_name> \endcode By default, the Toradex Colibri 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 7329fbf..d27030c 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 5.5/Boot2Qt/colibri-vf-eLinux/images/deploy.sh /dev/<device_name> + sudo dd bs=4k if=5.6/Boot2Qt/colibri-vf/images/b2qt-embedded-qt5-image-colibri-vf.img of=/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-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index ae999fe..0064e35 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>/5.5/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env init --device imx6qsabresd + <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env init --device imx6qsabresd \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>/5.5/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env help + <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env help \endcode \section1 Building the Image and Toolchain @@ -158,7 +158,7 @@ script. For example: \badcode - <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.imx6qsabresd + <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-build-scripts/embedded-common/init_build_env.sh <INSTALL_DIR>/5.6/Boot2Qt/sources/b2qt-build-scripts/embedded-linux/config.imx6qsabresd \endcode \note You can use the same build directory for Qt and the Yocto image. @@ -183,7 +183,7 @@ developing for your device. The following script does this for you. \badcode - <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-build-scripts/embedded-common/setup_qtcreator.sh + <INSTALL_DIR>/5.6/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 5fb4556..927159d 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.5 for Device Creation + \title Qt 5.6 for Device Creation \e {Qt for Device Creation} is a commercial offering, providing a fully-integrated solution for creating embedded Linux-based products. It |