summaryrefslogtreecommitdiffstats
path: root/src/doc
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/config/b2qt-project.qdocconf21
-rw-r--r--src/doc/src/devices/qtee-architech-tibidabo.qdoc4
-rw-r--r--src/doc/src/devices/qtee-bd-sl-imx6.qdoc2
-rw-r--r--src/doc/src/devices/qtee-beaglebone-black.qdoc4
-rw-r--r--src/doc/src/devices/qtee-imx53.qdoc2
-rw-r--r--src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc2
-rw-r--r--src/doc/src/devices/qtee-raspberry-pi.qdoc4
-rw-r--r--src/doc/src/devices/qtee-sabre-sd-imx6.qdoc23
-rw-r--r--src/doc/src/devices/qtee-supported-devices.qdoc47
-rw-r--r--src/doc/src/devices/qtee-toradex-apalis.qdoc4
-rw-r--r--src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc4
-rw-r--r--src/doc/src/devices/qtee-toradex-colibri-vf.qdoc4
-rw-r--r--src/doc/src/qtee-changelog.qdoc2
-rw-r--r--src/doc/src/qtee-custom-embedded-linux.qdoc21
-rw-r--r--src/doc/src/qtee-customization.qdoc2
-rw-r--r--src/doc/src/qtee-index.qdoc22
-rw-r--r--src/doc/src/qtee-static-linking.qdoc226
-rw-r--r--src/doc/src/shared/b2qt-post-install-setup.qdocinc6
18 files changed, 303 insertions, 97 deletions
diff --git a/src/doc/config/b2qt-project.qdocconf b/src/doc/config/b2qt-project.qdocconf
index c7b48fd..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.1
+description = Qt 5.6 for Device Creation
+version = 5.6.0
sourcedirs += ../src \
../../imports/wifi \
@@ -9,11 +9,13 @@ sourcedirs += ../src \
headerdirs += ../../wifi
-exampledirs += ../../../examples
+exampledirs += ../../../examples
imagedirs += ../images
indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \
+ $QT_INSTALL_DOCS/qtqml/qtqml.index \
+ $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
$QT_INSTALL_DOCS/qtgui/qtgui.index \
$QT_INSTALL_DOCS/qtcore/qtcore.index \
$QT_INSTALL_DOCS/qtserialport/qtserialport.index \
@@ -21,17 +23,20 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \
$QT_INSTALL_DOCS/qtwebengine/qtwebengine.index \
$QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
+# Listing qmake.index as part of 'indexes' fails, add a dependency as workaround
+depends = qmake
+
qhp.projects = B2Qt
qhp.B2Qt.file = b2qt.qhp
-qhp.B2Qt.namespace = com.digia.b2qt.551
+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"
@@ -39,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..4663195 100644
--- a/src/doc/src/devices/qtee-architech-tibidabo.qdoc
+++ b/src/doc/src/devices/qtee-architech-tibidabo.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target ArchiTech Tibidabo (embedded Linux)
+ \keyword ArchiTech Tibidabo
\page qtee-preparing-hardware-tibidabo.html
\title Preparing ArchiTech Tibidabo
\previouspage qtee-installation-guide.html
@@ -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 28adf93..e6c90f8 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..e3a1469 100644
--- a/src/doc/src/devices/qtee-beaglebone-black.qdoc
+++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target BeagleBone Black (embedded Linux)
+ \keyword BeagleBone Black
\page qtee-preparing-hardware-beaglebone.html
\title Preparing BeagleBone Black
\previouspage qtee-installation-guide.html
@@ -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-imx53.qdoc b/src/doc/src/devices/qtee-imx53.qdoc
index d732656..a6108cf 100644
--- a/src/doc/src/devices/qtee-imx53.qdoc
+++ b/src/doc/src/devices/qtee-imx53.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target i.MX53 Quick Start Board (embedded Linux)
+ \keyword i.MX53 Quick Start Board
\page qtee-preparing-hardware-imx53qsb.html
\title Preparing i.MX53 Quick Start Board
\previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
index 670ce51..a0f2549 100644
--- a/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
+++ b/src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target Kontron SMARC-sAMX6i (embedded Linux)
+ \keyword Kontron SMARC-sAMX6i
\page qtee-preparing-hardware-smarc-samx6i.html
\title Preparing Kontron SMARC-sAMX6i
\previouspage qtee-installation-guide.html
diff --git a/src/doc/src/devices/qtee-raspberry-pi.qdoc b/src/doc/src/devices/qtee-raspberry-pi.qdoc
index 4340065..9e58089 100644
--- a/src/doc/src/devices/qtee-raspberry-pi.qdoc
+++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target Raspberry Pi 2 Model B (embedded Linux)
+ \keyword Raspberry Pi 2 Model B
\page qtee-preparing-hardware-rasberrypi.html
\title Preparing Raspberry Pi 2
\previouspage qtee-installation-guide.html
@@ -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..86f696f 100644
--- a/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
+++ b/src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
@@ -17,19 +17,14 @@
**
****************************************************************************/
/*!
- \target SABRE SD i.MX6Quad (embedded Linux)
- \target SABRE SD i.MX6Dual (embedded Linux)
+ \keyword SABRE SD i.MX6Quad
\page qtee-preparing-hardware-imx6sabresd.html
- \title Preparing SABRE SD i.MX6
+ \title Preparing SABRE SD i.MX6Quad
\previouspage qtee-installation-guide.html
Take the following steps to prepare
\l {http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=RDIMX6SABREBRD}
- {Freescale SABRE SD i.MX6} boards for \B2Q:
- \list
- \li Freescale SABRE SD i.MX6Quad
- \li Freescale SABRE SD i.MX6Dual
- \endlist
+ {Freescale SABRE SD i.MX6Quad} for \B2Q:
\note It is important that you repeat the steps in this section after you
update \SDK.
@@ -52,19 +47,11 @@
\include detect-sd-card-device-name.qdocinc unmount
- To deploy the image on \b {i.MX6Quad}, enter the following commands:
+ To deploy the image, enter the following commands:
\badcode
cd <INSTALL_DIR>
- 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
- argument:
-
- \badcode
- cd <INSTALL_DIR>
- sudo 5.5/Boot2Qt/imx6qsabresd-eLinux/images/deploy.sh --uboot u-boot-imx6dlsabresd.imx /dev/<device_name>
+ sudo dd bs=4k if=5.6/Boot2Qt/imx6qsabresd/images/b2qt-embedded-qt5-image-imx6qsabresd.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-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc
index 1c9f07d..360c940 100644
--- a/src/doc/src/devices/qtee-supported-devices.qdoc
+++ b/src/doc/src/devices/qtee-supported-devices.qdoc
@@ -29,15 +29,14 @@
\list
\li \l{Boundary Devices i.MX6 Boards}
- \li \l{SABRE SD i.MX6Quad (embedded Linux)}
- \li \l{SABRE SD i.MX6Dual (embedded Linux)}
- \li \l{Toradex Apalis iMX6 (embedded Linux)}
- \li \l{Toradex Colibri iMX6 (embedded Linux)}
- \li \l{Toradex Colibri VF50 and VF61 (embedded Linux)}
- \li \l{ArchiTech Tibidabo (embedded Linux)}
- \li \l{Kontron SMARC-sAMX6i (embedded Linux)}
- \li \l{BeagleBone Black (embedded Linux)}
- \li \l{Raspberry Pi 2 Model B (embedded Linux)}
+ \li \l{SABRE SD i.MX6Quad}
+ \li \l{Toradex Apalis iMX6}
+ \li \l{Toradex Colibri iMX6}
+ \li \l{Toradex Colibri VF50 and VF61}
+ \li \l{ArchiTech Tibidabo}
+ \li \l{Kontron SMARC-sAMX6i}
+ \li \l{BeagleBone Black}
+ \li \l{Raspberry Pi 2 Model B}
\endlist
If you use only the emulator, you can skip this step
@@ -99,28 +98,23 @@
the Qt online installer.
\table
- \header \li Devices with GPU \li eLinux
+ \header \li Devices with GPU
\row \li \l{http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=RDIMX6SABREBRD}
- {Freescale® SABRE SD i.MX6} (Freescale® i.MX6)\br
- ARM Cortex A9, Vivante GC2000 GPU, 1GB RAM
- \li \image ok
+ {Freescale® SABRE SD i.MX6Quad} (Freescale® i.MX6)\br
+ 4x ARM Cortex A9, Vivante GC2000 GPU, 1GB RAM
\row \li \l{http://beagleboard.org/products/beaglebone%20black}
{BeagleBone Black}\br
TIAM335x 1GHz ARM® Cortex-A8, 512 MB RAM
- \li \image ok
\row \li \b{\B2Q Emulator}\br
Included in the development environment
- \li \image ok
- \header \li Devices Without GPU \li
+ \header \li Devices Without GPU
\row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module}
{Toradex Colibri VF61}\br
Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br
solution with 1 MB on-chip SRAM
- \li \image ok
\row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF5xx-computer-module}
{Toradex Colibri VF50}\br
Single-core (ARM Cortex-A5) solution with 1.5 MB on-chip SRAM
- \li \image ok
\endtable
\section2 Group 2
@@ -139,38 +133,32 @@
online installer.
\table
- \header \li Devices with GPU \li eLinux
+ \header \li Devices with GPU
\row \li \l{http://boundarydevices.com/product-selector-guide/}
{Boundary Devices i.MX6 Boards}\br
Freescale® i.MX 6 based devices with\br
Vivante GC2000 GPU
- \li \image ok
\row \li \l{http://www.silica.com/product/architech-tibidabo.html}
{SILICA ArchiTech Tibidabo}\br
Freescale® i.MX 6Q ARM Cortex™-A9 @800 MHz,\br
2GB DDR3, 128MB NOR, Vivante GC2000 GPU
- \li \image ok
\row \li \l{http://www.toradex.com/products/apalis-arm-computer-modules/freescale-imx-6-computer-module}
{Toradex Apalis iMX6}\br
Freescale® i.MX 6Q ARM Cortex™-A9 @1 GHz,\br
1GB DDR3, 4GB eMMC, Vivante GC2000 GPU
- \li \image ok
\row \li \l{http://developer.toradex.com/product-selector/colibri-imx6}
{Toradex Colibri iMX6}\br
Freescale® i.MX6S or i.MX6DL ARM Cortex™-A9 @800MHz - 1GHz,\br
256MB (single core), 512MB (dual core) DDR3, 4GB eMMC,\br
Vivante 2D/3D GPU
- \li \image ok
\row \li \l{http://www.kontron.com/products/boards-and-standard-form-factors/smarc/smarc-samx6i.html}
{Kontron SMARC-sAMX6i}\br
Freescale® i.MX 6 ARM Cortex™-A9 @800MHz - 1.2GHz,\br
2GB DDR3, 2-64GB eMMC, Vivante GC2000 GPU
- \li \image ok
\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
\section2 Group 3
@@ -183,26 +171,25 @@
The Qt Company for consultancy services.
\table
- \header \li Device \li eLinux
+ \header \li Device
+ \row \li \l{http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=RDIMX6SABREBRD}
+ {Freescale® SABRE SD i.MX6Dual} (Freescale® i.MX6)\br
+ 2x ARM Cortex A9, Vivante GC2000 GPU, 1GB RAM
\row \li \l{http://beagleboard.org/hardware-xM}
{BeagleBoard-xM}\br
1GHz ARM Cortex A8, PowerVR SGX530 GPU,\br
512MB RAM
- \li \image ok
\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
\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
\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
diff --git a/src/doc/src/devices/qtee-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc
index 8d04b6e..b6acc6e 100644
--- a/src/doc/src/devices/qtee-toradex-apalis.qdoc
+++ b/src/doc/src/devices/qtee-toradex-apalis.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target Toradex Apalis iMX6 (embedded Linux)
+ \keyword Toradex Apalis iMX6
\page qtee-preparing-hardware-apalis-imx6.html
\title Preparing Toradex Apalis iMX6
\previouspage qtee-installation-guide.html
@@ -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..6b96c09 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target Toradex Colibri iMX6 (embedded Linux)
+ \keyword Toradex Colibri iMX6
\page qtee-preparing-hardware-colibri-imx6.html
\title Preparing Toradex Colibri iMX6
\previouspage qtee-installation-guide.html
@@ -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..fbf1f37 100644
--- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
+++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
@@ -17,7 +17,7 @@
**
****************************************************************************/
/*!
- \target Toradex Colibri VF50 and VF61 (embedded Linux)
+ \keyword Toradex Colibri VF50 and VF61
\page qtee-preparing-hardware-colibri-vf.html
\title Preparing Toradex Colibri VF50 and VF61
\previouspage qtee-installation-guide.html
@@ -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-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc
index cfa0bd1..98358c7 100644
--- a/src/doc/src/qtee-changelog.qdoc
+++ b/src/doc/src/qtee-changelog.qdoc
@@ -291,7 +291,7 @@
currently not supported
\li \l {Qt Quick Compiler} (Technology Preview) was added to the \B2Q stack
\li Nexus 7 (2013) was added as a reference device for embedded Android
- \li \l{Preparing SABRE SD i.MX6}{Freescale SABRE SD i.MX6Quad} was
+ \li \l{Preparing SABRE SD i.MX6Quad}{Freescale SABRE SD i.MX6Quad} was
added as a reference device for embedded Linux
\li WiFi networking support and configuration were implemented on
embedded Linux
diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc
index b6c77e6..5d2a577 100644
--- a/src/doc/src/qtee-custom-embedded-linux.qdoc
+++ b/src/doc/src/qtee-custom-embedded-linux.qdoc
@@ -20,7 +20,7 @@
\page qtee-custom-embedded-linux-image.html
\title Building Your Own Embedded Linux Image
\previouspage qtee-customization.html
- \nextpage qtee-changelog.html
+ \nextpage qtee-static-linking.html
\B2QL is built using the tools and resources from the \l {Yocto Project},
and is based on Yocto's reference distribution (\e Poky). You can
@@ -63,12 +63,12 @@
\section1 Setting Up Yocto Build Environment
- Run the setup script that initializes the Yocto environment. Using Raspberry Pi as
- an example:
+ Run the setup script that initializes the Yocto environment. Using Freescale
+ SABRE SD i.MX6Quad as an example:
\badcode
cd <BuildDir>
- <INSTALL_DIR>/5.5/Boot2Qt/sources/b2qt-yocto-meta/b2qt-init-build-env init --device raspberrypi
+ <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
\note Support for Kontron SMARC-sAMX6i requires additional Yocto Board Support Package that is
@@ -90,11 +90,10 @@
\section1 Building the Image and Toolchain
After the Yocto environment is set up, you need to configure the
- build environment for your target device. Using Raspberry Pi as
- an example:
+ build environment for your target device:
\badcode
- export MACHINE=raspberrypi
+ export MACHINE=imx6qsabresd
source ./setup-environment.sh
\endcode
@@ -162,10 +161,10 @@
\e {Build scripts} source package contains scripts that can be used to
build Qt and all additional Qt addons that are part of \B2QL image.
To setup build environment for your target hardware, run the initialization
- script. Using Raspberry Pi as an example:
+ 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.raspberrypi
+ <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.
@@ -190,7 +189,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-customization.qdoc b/src/doc/src/qtee-customization.qdoc
index 272bc07..5604375 100644
--- a/src/doc/src/qtee-customization.qdoc
+++ b/src/doc/src/qtee-customization.qdoc
@@ -239,7 +239,7 @@
\section1 Using Network Connection for ADB
By default, \B2Q uses USB cable for communication between device and Qt Creator.
- On \B2QL, you can change the device to use ethernet network connection for the
+ On \B2QL, you can change the device to use ethernet network connection (IPv4) for the
communication. To enable network connection, you need to modify file
\c /etc/default/adbd located on the devices, and change value of \c USE_ETHERNET
to \c 'yes'. This can also be done with \c adb, while the device is still
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc
index 1439576..edec7bb 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
\welcome
\e {Qt for Device Creation} is a commercial offering, providing a
@@ -45,15 +45,14 @@
\li \l{Preparing Hardware}
\list
\li \l{Boundary Devices i.MX6 Boards}
- \li \l{Preparing SABRE SD i.MX6}{SABRE SD i.MX6Quad (embedded Linux)}
- \li \l{Preparing SABRE SD i.MX6}{SABRE SD i.MX6Dual (embedded Linux)}
- \li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6 (embedded Linux)}
- \li \l{Preparing Toradex Colibri iMX6}{Toradex Colibri iMX6 (embedded Linux)}
- \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 Kontron SMARC-sAMX6i}{Kontron SMARC-sAMX6i (embedded Linux)}
- \li \l{Preparing BeagleBone Black}{BeagleBone Black (embedded Linux)}
- \li \l{Preparing Raspberry Pi 2}{Raspberry Pi 2 Model B (embedded Linux)}
+ \li \l{Preparing SABRE SD i.MX6Quad}{SABRE SD i.MX6Quad}
+ \li \l{Preparing Toradex Apalis iMX6}{Toradex Apalis iMX6}
+ \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
\li \l{Building and Running Embedded Applications}
\list
@@ -61,6 +60,9 @@
\endlist
\li \l{Customization}
\li \l{Building Your Own Embedded Linux Image}
+ \list
+ \li \l{Linking to Static Builds of Qt}
+ \endlist
\li \l{ChangeLog}
\li \l{Troubleshooting}
\li \l{Known Issues}
diff --git a/src/doc/src/qtee-static-linking.qdoc b/src/doc/src/qtee-static-linking.qdoc
new file mode 100644
index 0000000..33ebd6b
--- /dev/null
+++ b/src/doc/src/qtee-static-linking.qdoc
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the contact form at
+** http://www.qt.io
+**
+** This file is part of Qt Enterprise Embedded.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** the contact form at http://www.qt.io
+**
+****************************************************************************/
+/*!
+ \page qtee-static-linking.html
+ \title Linking to Static Builds of Qt
+ \previouspage qtee-custom-embedded-linux-image.html
+ \nextpage qtee-changelog.html
+
+ The device-specific sysroots in \B2Q come with a dynamically linked version
+ of Qt libraries (\c *.so files). In some cases, using static linking may be
+ preferable; it avoids the dependencies to external libraries, produces
+ single, self-contained application binaries making deployment easier,
+ and may lead to smaller binary size as unused code can be stripped away.
+
+ Internally, Qt uses dynamic linking with plugins for a lot of its functionality.
+ In order to have a fully functioning application, extra attention is needed on
+ which plugins to include in a static build. A downside of static linking is that
+ adding or updating a plugin requires a complete rebuild and redeployment of the
+ application.
+
+ \section1 Requirements
+
+ In addition to installing \SDK, ensure that required packages are installed for
+ all Qt modules that are included in the static build. For more information, see
+ \l {Qt for X11 Requirements#OpenGL Dependencies}{Qt for Linux Requirements} and
+ \l {Qt for Linux/X11#Requirements for Development Host}{Requirements for
+ Development Host}. Note that dependencies for the \e xcb platform plugin need
+ not be installed, as Qt will be configured without xcb support.
+
+ Install Qt sources by running the \e MaintenanceTool, located in the root of
+ \c INSTALL_DIR. Alternatively,
+ \l {https://wiki.qt.io/Building_Qt_5_from_Git#Getting_the_source_code}{clone}
+ the \e qt5 repository using git.
+
+ \section1 Building Qt for Static Linking
+
+ As the first step before configuring Qt, the \e mkspec for the target device
+ needs to be copied over to Qt sources, so that \e qmake will reference the
+ correct toolchains when creating the makefiles.
+
+ Using Raspberry Pi 2 as an example:
+
+ \badcode
+ cp -a <INSTALL_DIR>/5.6/Boot2Qt/raspberrypi2-eLinux/qt5/mkspecs/devices/linux-rasp-pi2-g++-b2qt \
+ <QT_SRC>/qtbase/mkspecs/devices
+ \endcode
+
+ Above, <QT_SRC> is the location of Qt sources (top-level directory containing
+ the \e configure script).
+
+ To use static linking, Qt must be built with the \c -static configuration
+ option. The following configure command selects the correct options and
+ \e sysroot for the Raspberry Pi 2.
+
+ To make the set of configure options reusable and more readable, the
+ device-specific paths are defined as environment variables:
+
+ \badcode
+ export SYSROOT_BASE=<INSTALL_DIR>/5.6/Boot2Qt/raspberrypi2-eLinux/toolchain/sysroots
+ export TARGET_DEVICE=linux-rasp-pi2-g++-b2qt
+ export SYSROOT_TARGET=cortexa7hf-vfp-vfpv4-neon-poky-linux-gnueabi
+ export CROSSCOMPILE_PREFIX=x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-
+ export HOST_PREFIX=~/build/qt5-rasp-pi2
+ \endcode
+
+ Description of the used variables:
+
+ \table
+ \row \li \c SYSROOT_BASE \li Base directory for the sysroots
+ (host and target) for the device
+
+ \row \li \c TARGET_DEVICE \li Target device (mkspec)
+
+ \row \li \c SYSROOT_TARGET \li Target sysroot directory under
+ \c SYSROOT_BASE
+
+ \row \li \c CROSSCOMPILE_PREFIX \li Cross-compilation toolchain path
+ and tool prefix (ends with '-')
+
+ \row \li \c HOST_PREFIX \li Location to install the host
+ binaries (qmake, moc, rcc, etc.)
+ \endtable
+
+ Using the above variables, \e configure can be called as follows:
+
+ \badcode
+ cd <QT_SRC>
+ ./configure -commercial -release -static \
+ -prefix /opt/qt5 -hostprefix $HOST_PREFIX \
+ -device $TARGET_DEVICE \
+ -device-option CROSS_COMPILE=$SYSROOT_BASE/$CROSSCOMPILE_PREFIX \
+ -sysroot $SYSROOT_BASE/$SYSROOT_TARGET \
+ -mysql_config $SYSROOT_BASE/$SYSROOT_TARGET/usr/bin/mysql_config \
+ -psql_config /dev/null \
+ -no-xcb -opengl es2 \
+ -nomake tests -nomake examples \
+ -skip qtwebengine
+ \endcode
+
+ Above, \c -prefix sets the intended destination of the Qt build on the
+ device (sysroot). Running \c {make install} will, by default, install Qt under
+ \c sysroot/prefix.
+
+ Compiling in \e xcb support is disabled, OpenGL ES 2.0 support is selected,
+ and \l [QtWebEngine] {Qt WebEngine} is excluded from the build.
+
+ More information about configure options is available in the \l [QtDoc]
+ {Qt for Embedded Linux#Configuring a Specific Device}{Qt for Embedded Linux}
+ documentation.
+
+ If configuration is successful, proceed to build and install Qt:
+
+ \badcode
+ make -j6 && make install
+ \endcode
+
+ The host tools (in particular, qmake) are now installed in \c HOST_PREFIX,
+ and the statically compiled Qt libraries are in
+ \c $SYSROOT_BASE/$SYSROOT_TARGET/opt/qt5. At this point, it's also possible
+ to add the new Qt version into Qt Creator and set up a \e Kit for it:
+
+ \list
+ \li \l {https://doc.qt.io/qtcreator/creator-project-qmake.html}{Qt Creator: Adding Qt Versions}
+ \li \l {https://doc.qt.io/qtcreator/creator-targets.html}{Qt Creator: Adding Kits}
+ \endlist
+
+ \section1 Building a Static Application
+
+ Building a stand-alone, static application requires all the necessary
+ plugins to be also statically linked. By default, qmake compiles a set of
+ plugins based on which Qt modules are used, and adds them to the \l
+ [QMake] {QTPLUGIN} variable.
+
+ After running qmake, the project directory contains a
+ \c <target_name>_plugin_import.cpp file that imports the plugins
+ using Q_IMPORT_PLUGIN() macros. The default set often contains more
+ plugins than are actually needed; to prevent unnecessary bloat, it's
+ possible to exclude certain plugin classes from the build.
+
+ For example, to exclude additional image format plugins, use:
+
+ \badcode
+ QTPLUGIN.imageformats = -
+ \endcode
+
+ Alternatively, the automatic generation of Q_IMPORT_PLUGIN() macros can
+ be turned off:
+
+ \badcode
+ CONFIG -= import_plugins
+ \endcode
+
+ The relevant plugins then need to be explicitly imported in the application
+ code.
+
+ For more information, see \l {How to Create Qt Plugins#Static Plugins}
+ {Static Plugins}.
+
+ \section2 Adding QML Imports
+
+ Similar to how Qt plugins are imported, qmake invokes the
+ \e qmlimportscanner tool to scan the application's .qml files, and
+ generates a \c <target_name>_qml_plugin_import.cpp file containing a
+ Q_IMPORT_PLUGIN() call for each static plugin associated with a QML import.
+
+ For example, for a simple QML application using the \c QtQuick and \c
+ QtQuick.Window import statements, the following statements are generated:
+
+ \code
+ Q_IMPORT_PLUGIN(QtQuick2Plugin)
+ Q_IMPORT_PLUGIN(QtQuick2WindowPlugin)
+ \endcode
+
+ In addition, the resources used by the QML imports need to be made
+ available to the QML engine. The best approach is to copy the files from
+ the source location into the application's project directory and add them
+ to the Qt resource system, together with the application's own resources.
+
+ At minimum, even though an import plugin uses no extra resources (.qml,
+ .js, or image files), its \e qmldir file needs to be accessible and
+ located under the correct \l [QtQml] {QML Import Path} {QML import path}.
+
+ For example, the following entries in a Qt resource collection file
+ (.qrc) places the qmldir files under the \c qml/ prefix in resources:
+
+ \badcode
+ <file>qml/QtQuick.2/qmldir</file>
+ <file>qml/QtQuick/Window.2/qmldir</file>
+ \endcode
+
+ Finally, the QML engine needs to be informed about the import path that's
+ now located within the resources. The following implementation of \c main()
+ sets the import path to \c qrc:/qml before loading \c main.qml:
+
+ \code
+ #include <QGuiApplication>
+ #include <QQmlApplicationEngine>
+
+ int main(int argc, char *argv[])
+ {
+ QGuiApplication app(argc, argv);
+
+ QQmlApplicationEngine engine;
+ engine.setImportPathList(QStringList(QStringLiteral("qrc:/qml")));
+ engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+
+ return app.exec();
+ }
+ \endcode
+*/
diff --git a/src/doc/src/shared/b2qt-post-install-setup.qdocinc b/src/doc/src/shared/b2qt-post-install-setup.qdocinc
index e73b8e7..4444dfc 100644
--- a/src/doc/src/shared/b2qt-post-install-setup.qdocinc
+++ b/src/doc/src/shared/b2qt-post-install-setup.qdocinc
@@ -83,9 +83,9 @@
\list 1
\li Select \b{Tools > Options > Devices > Add}.
\li Select \b{Boot2Qt Device} > \b{Start Wizard}.
- \li Enter the device name and network address. You can check the device
- address in the \e{Launcher Settings} when the device is running the
- \B2Q demo.
+ \li Enter the device name and network address (IPv4). You can check the
+ device address in the \e{Launcher Settings} when the device is running
+ the \B2Q demo.
\li Select \b{Finish}.
\endlist
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 00:45:38 +0000