From c03fcde202a0dea22e753b3a380081415861d9da Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 22 Nov 2013 12:04:18 +0100 Subject: Add license headers Add an Enterprise License header to source files. Change-Id: I373886dade31ce00d4c10c64ebaf8ba226d5a62d Reviewed-by: Eirik Aavitsland --- src/doc/src/b2qt-post-install-setup.qdocinc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'src/doc/src/b2qt-post-install-setup.qdocinc') diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc index 194f16d..c4fe4a2 100644 --- a/src/doc/src/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/b2qt-post-install-setup.qdocinc @@ -1,3 +1,21 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc +** All rights reserved. +** For any questions to Digia, please use the contact form at +** http://qt.digia.com/ +** +** 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://qt.digia.com/ +** +****************************************************************************/ /*! //! [setting up usb access] On Ubuntu Linux you have to grant your development user access to -- cgit v1.2.3 From f4e22adea13f4d9b0fbbe1c407aacb9d5584dd97 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 9 Dec 2013 09:58:08 +0100 Subject: Doc: edit the installation instructions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove excessive formatting as it reduces readability. Use numbered lists to describe processes. Use active voice instead of passive voice. Edit for grammar and style. Change-Id: I1e5f9636c57898ea09633167e022a3195a2967d6 Reviewed-by: Topi Reiniö --- src/doc/src/b2qt-post-install-setup.qdocinc | 55 +++++++++++++++-------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'src/doc/src/b2qt-post-install-setup.qdocinc') diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc index c4fe4a2..d1a6f08 100644 --- a/src/doc/src/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/b2qt-post-install-setup.qdocinc @@ -18,54 +18,57 @@ ****************************************************************************/ /*! //! [setting up usb access] - On Ubuntu Linux you have to grant your development user access to - plugged in devices. This is done by creating a new \e{udev} rule - that allows access to the device via USB. First, run the following - command in a shell: + On Ubuntu Linux, the development user account must have access to plugged in + devices. To allow the development user access to the device via USB, create + a new \e{udev} rule: + + \list 1 + + \li Run the following command in a shell: \code echo 'SUBSYSTEM=="usb", ATTRS{idVendor}=="18d1", TAG+="udev-acl"' | sudo tee -a /etc/udev/rules.d/70-boot2qt.rules \endcode - Now connect the running device to the development host with a USB - cable. (If already connected, disconnect and reconnect the USB - cable after running the command above). + \li Connect the running device to the development host with a USB + cable. If the device is already connected, disconnect and reconnect the USB + cable after running the command above. - On \B2QA, you can confirm that the connection is working by running - this shell command: + \li On \B2QA, you can confirm that the connection is working by running + the following shell command: \code /Tools/b2qt/adb devices \endcode - The output should be a list of connected android devices, - identified with a serial number and a name. Note that the emulator - may be listed as well, its serial number will be its IP and port - number (\c{192.168.56.101:5555}). If your device is missing from + The output should be a list of connected Android devices, + identified with a serial number and a name. If your device is missing from the list, or the serial number is \c{??????}, the connection is - not working properly. If so, check that the device is powered up, - and that the USB cable has been disconnected and reconnected. + not working properly. Check that the device is powered up, and disconnect + and reconnect the USB cable. + + The emulator may be listed as well. Its serial number is its IP and the port + number: \c{192.168.56.101:5555}. + \endlist The system log files \c{/var/log/udev} and \c{/var/log/syslog} may provide relevant information in case of connection problems. //! [setting up usb access] //! [configuring device kit] - After the hardware has been prepared, there is one final step required - to set up the development tools in Qt Creator for your device. - - You have to configure the right device to be used for each \b{Kit}. - - To do so, connect your device to your computer via USB and launch - Qt Creator. Then, + After you have prepared the hardware, you must perform one final step + to set up the development tools in Qt Creator for your device. That is, + you must configure the correct device to be used for each build and run + \e{kit}. Connect your device to the development host via USB and launch + Qt Creator. In Qt Creator: //! [steps for device kit] \list 1 - \li Go to \b{Tools > Options > Build & Run > Kits} - \li Select one of the predefined Kits starting with \e{Boot2Qt...} + \li Select \b{Tools > Options > Build & Run > Kits}. + \li Select one of the predefined kits starting with \e{Boot2Qt...} that matches the type of your device. - \li Select the correct device in the \b{Device} combobox. - \li Click \b{Ok}. + \li Select the correct device in the \b{Device} field. + \li Select \b{OK}. \endlist //! [steps for device kit] //! [configuring device kit] -- cgit v1.2.3 From c56c9bc0107bced7635bc93edd8521f415e005c7 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 10 Dec 2013 12:26:21 +0100 Subject: Doc: edit the sections about preparing devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Edit for grammar and style. Use standard wording in lists. Use active voice instead of passive voide. Use lists for all processes. Use the term "SD card" everywhere instead of "micro-SD card". Replace XXX with . Change-Id: Ie300dac911b42120de5e236676aa7b43c39f27d7 Reviewed-by: Topi Reiniö --- src/doc/src/b2qt-post-install-setup.qdocinc | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/doc/src/b2qt-post-install-setup.qdocinc') diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc index d1a6f08..ef93b3f 100644 --- a/src/doc/src/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/b2qt-post-install-setup.qdocinc @@ -74,22 +74,21 @@ //! [configuring device kit] //! [configuring network device] - After the hardware has been prepared, there are final steps required - to set up the development tools in Qt Creator for your device. - - To do so, connect your device to network via ethernet cable and launch - Qt Creator. Then, + After you have prepared the hardware, you must set up the development tools + in Qt Creator for your device. Connect your device to the network via an + Ethernet cable and launch Qt Creator. In Qt Creator: \list 1 - \li Go to \b{Tools > Options > Devices} - \li Click \b{Add...} - \li Select \b{Boot2Qt Device} and Click \b{Start Wizart} - \li Fill in name of the device and network address. Device address can be seen from - \e{Launcher Settings} when device is running \B2Q demo - \li Click \b{Finish}. + \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 Select \b{Finish}. \endlist - You also have to configure the right device to be used for each \b{Kit}. + You also have to configure the correct device to be used for each build and + run \e{kit}: \include b2qt-post-install-setup.qdocinc steps for device kit -- cgit v1.2.3 From 59649939d06664d722046cd54e0933c5b402e9a9 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 10 Dec 2013 14:33:36 +0100 Subject: Doc: use power off/on consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Clarify the options to power off Nexus 7. Change-Id: I13fe92c6cdc00d9033a603edd2bde334aacf8a77 Reviewed-by: Rainer Keller Reviewed-by: Topi Reiniö --- src/doc/src/b2qt-post-install-setup.qdocinc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/doc/src/b2qt-post-install-setup.qdocinc') diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc index ef93b3f..d5c55cf 100644 --- a/src/doc/src/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/b2qt-post-install-setup.qdocinc @@ -44,7 +44,7 @@ The output should be a list of connected Android devices, identified with a serial number and a name. If your device is missing from the list, or the serial number is \c{??????}, the connection is - not working properly. Check that the device is powered up, and disconnect + not working properly. Check that the device is powered on, and disconnect and reconnect the USB cable. The emulator may be listed as well. Its serial number is its IP and the port -- cgit v1.2.3