From bfc709b616320dc2a68f7ddb866d77aa8a503d68 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 21 Oct 2013 18:57:47 +0200 Subject: Fix scheduling_policy service for Android 4.2.2. Change-Id: Ia27c7e7e0f36b3e9bc7c37aeb77c897ce46bedfe Reviewed-by: Eirik Aavitsland --- src/doppelganger/schedulingpolicyservice.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doppelganger/schedulingpolicyservice.cpp b/src/doppelganger/schedulingpolicyservice.cpp index 641ddc4..27483e0 100644 --- a/src/doppelganger/schedulingpolicyservice.cpp +++ b/src/doppelganger/schedulingpolicyservice.cpp @@ -12,7 +12,7 @@ enum { }; #define PRIORITY_MIN 1 -#define PRIORITY_MAX 2 +#define PRIORITY_MAX 3 SchedulingPolicyService::SchedulingPolicyService() { -- cgit v1.2.3 From 663c9851fe367e8c2bdf8bc37e64b9e1668e3fe2 Mon Sep 17 00:00:00 2001 From: Yoann Lopes Date: Mon, 21 Oct 2013 19:02:31 +0200 Subject: Fix sound on Nexus 7. A behavior change in the HW audio driver for 4.2.2 causes the audio routing to never be set up automatically. Set the audio orientation to force the HW driver to set up audio routing. Task-number: QTRD-2472 Change-Id: I6f76aa299d0bc89c7061c7074dc5780e62045f0a Reviewed-by: Eirik Aavitsland --- src/qt_hw_init/main.cpp | 23 +++-------------------- src/utils/qdroidutils.cpp | 22 ++++++++++++++++++++++ src/utils/qdroidutils.h | 9 +++++++++ src/utils/utils.pro | 2 +- 4 files changed, 35 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/qt_hw_init/main.cpp b/src/qt_hw_init/main.cpp index 9fb810a..3419c21 100644 --- a/src/qt_hw_init/main.cpp +++ b/src/qt_hw_init/main.cpp @@ -3,6 +3,9 @@ static void setMaxVolume(QDroidUtils *utils) { + // Set the audio orientation to something to force the HW driver to reconfigure + // audio routing (workaround for bug on Nexus 7) + utils->setOrientationForAudioSystem(QDroidUtils::LandscapeAudioOrientation); utils->setMasterVolume(100); utils->setMasterMute(false); utils->setStreamVolume(QDroidUtils::SystemAudioStream, 100); @@ -16,32 +19,12 @@ static void setDisplayBrightness(QDroidUtils *utils) utils->setDisplayBrightness(255); } -static void showValues(QDroidUtils *utils) -{ - qDebug() << "Master volume:" << utils->masterVolume(); - qDebug() << "Master mute:" << utils->masterMute(); - qDebug() << "System audio volume:" << utils->streamVolume(QDroidUtils::SystemAudioStream); - qDebug() << "System audio mute:" << utils->streamMute(QDroidUtils::SystemAudioStream); - qDebug() << "Music audio volume:" << utils->streamVolume(QDroidUtils::MusicAudioStream); - qDebug() << "Music audio mute:" << utils->streamMute(QDroidUtils::MusicAudioStream); - qDebug() << "Notification audio volume:" << utils->streamVolume(QDroidUtils::NotificationAudioStream); - qDebug() << "Notification audio mute:" << utils->streamMute(QDroidUtils::NotificationAudioStream); - qDebug() << "EnforcedAudible audio volume:" << utils->streamVolume(QDroidUtils::EnforcedAudibleAudioStream); - qDebug() << "EnforcedAudible audio mute:" << utils->streamMute(QDroidUtils::EnforcedAudibleAudioStream); -} - int main(int, char *[]) { QDroidUtils utils; - qDebug() << "Audio settings before change:"; - showValues(&utils); - setMaxVolume(&utils); setDisplayBrightness(&utils); - qDebug() << "Audio settings after change:"; - showValues(&utils); - return 0; } diff --git a/src/utils/qdroidutils.cpp b/src/utils/qdroidutils.cpp index f2194c4..da443c9 100644 --- a/src/utils/qdroidutils.cpp +++ b/src/utils/qdroidutils.cpp @@ -45,6 +45,28 @@ void QDroidUtils::powerOffSystem() qWarning("powerOff returned"); } +void QDroidUtils::setOrientationForAudioSystem(AudioOrientation orientation) +{ +#ifdef Q_OS_ANDROID_NO_SDK + QString orientationString = QStringLiteral("undefined"); + switch (orientation) { + case LandscapeAudioOrientation: + orientationString = QStringLiteral("landscape"); + break; + case PortraitAudioOrientation: + orientationString = QStringLiteral("portrait"); + break; + case SquareAudioOrientation: + orientationString = QStringLiteral("square"); + break; + default: + break; + } + android::AudioSystem::setParameters(0, android::String8(QStringLiteral("orientation=%2") + .arg(orientationString).toLatin1().constData())); +#endif +} + /*! * Sets the master volume to \a volume. * The volume can range from 0 to 100 and is linear. diff --git a/src/utils/qdroidutils.h b/src/utils/qdroidutils.h index 339a529..b0f9061 100644 --- a/src/utils/qdroidutils.h +++ b/src/utils/qdroidutils.h @@ -8,6 +8,13 @@ class Q_DECL_EXPORT QDroidUtils : public QObject Q_OBJECT Q_ENUMS(AudioStreamType) public: + enum AudioOrientation { + LandscapeAudioOrientation, + PortraitAudioOrientation, + SquareAudioOrientation, + UndefinedAudioOrientation, + }; + enum AudioStreamType { DefaultAudioStream = -1, VoiceCallAudioStream = 0, @@ -36,6 +43,8 @@ public Q_SLOTS: void rebootSystem(); void powerOffSystem(); + void setOrientationForAudioSystem(AudioOrientation orientation); + void setMasterVolume(int volume); void setMasterMute(bool mute); void setStreamVolume(AudioStreamType stream, int volume); diff --git a/src/utils/utils.pro b/src/utils/utils.pro index 5711337..a15231f 100644 --- a/src/utils/utils.pro +++ b/src/utils/utils.pro @@ -11,7 +11,7 @@ QT = core network MODULE = droidutils load(qt_module) -android: LIBS += -lmedia -lhardware -lcutils +android: LIBS += -lmedia -lhardware -lcutils -lutils HEADERS += \ $$PWD/qdroidutils.h -- cgit v1.2.3 From d050b4ae6ce92ada4105adaba664e9ab3cd2506c Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Tue, 22 Oct 2013 12:46:28 +0200 Subject: Doc: Updated navigation bar landing page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Landing page title changed to "Qt Enterprise Embedded" Change-Id: I07121d510fda8c8b5f2e8db527a08c4a4b39431c Reviewed-by: Topi Reiniö --- src/doc/config/b2qt.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 781e102..830d44b 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -31,4 +31,4 @@ macro.SDK = "Qt Enterprise Embedded" macro.B2QA = "\\e {Boot to Qt for embedded Android}" macro.B2QL = "\\e {Boot to Qt for embedded Linux}" -navigation.landingpage = "Boot to Qt Introduction" +navigation.landingpage = "Qt Enterprise Embedded" -- cgit v1.2.3 From 9c0ce6cd0cdced483152d631163da4c313daf0b5 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 22 Oct 2013 14:07:56 +0200 Subject: Doc: Change html prefixes again Change prefixes from 'qee' to 'qtee'. Change-Id: I82da3a811cb1b4fa888d46f208881a8461abfe54 Reviewed-by: Eirik Aavitsland --- src/doc/src/b2qt.qdoc | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index e2cec14..e1e3b4b 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -18,7 +18,7 @@ /*! \contentspage{index.html}{Qt Enterprise Embedded} \page index.html - \nextpage qee-installation-guide.html + \nextpage qtee-installation-guide.html \title Qt Enterprise Embedded \e{\b{IMPORTANT:} Make sure to follow the \l{Installation Guide} @@ -112,10 +112,10 @@ */ /*! - \page qee-installation-guide.html + \page qtee-installation-guide.html \title Installation Guide \previouspage index.html - \nextpage qee-preparing-hardware.html + \nextpage qtee-preparing-hardware.html \e{IMPORTANT: \SDK requires the following installation steps to be followed closely.} @@ -217,10 +217,10 @@ */ /*! - \page qee-preparing-hardware.html + \page qtee-preparing-hardware.html \title Preparing Hardware - \previouspage qee-installation-guide.html - \nextpage qee-building-and-running.html + \previouspage qtee-installation-guide.html + \nextpage qtee-building-and-running.html Before deploying and testing your Qt application on hardware, the target device needs to be flashed with an image that contains the @@ -239,10 +239,10 @@ /*! \target Nexus 7 (embedded Android) - \page qee-preparing-hardware-nexus-7.html + \page qtee-preparing-hardware-nexus-7.html \title Preparing Nexus 7 - \previouspage qee-installation-guide.html - \nextpage qee-building-and-running.html + \previouspage qtee-installation-guide.html + \nextpage qtee-building-and-running.html When using a \l{http://www.google.com/nexus/7/specs/}{Nexus 7} as a development device, following steps are required to prepare it for @@ -349,10 +349,10 @@ /*! \target BeagleBoard-xM (embedded Android and Linux) - \page qee-preparing-hardware-beagleboard.html + \page qtee-preparing-hardware-beagleboard.html \title Preparing BeagleBoard-xM - \previouspage qee-installation-guide.html - \nextpage qee-building-and-running.html + \previouspage qtee-installation-guide.html + \nextpage qtee-building-and-running.html When using a \l{http://beagleboard.org/hardware-xM}{BeagleBoard-xM} as a development device, following steps are required to prepare it for @@ -409,9 +409,9 @@ /*! \target Sabre Lite i.MX 6 (embedded Android and Linux) - \page qee-preparing-hardware-imx6.html + \page qtee-preparing-hardware-imx6.html \title Preparing Sabre Lite i.MX 6 - \previouspage qee-installation-guide.html + \previouspage qtee-installation-guide.html When using a \l{http://boundarydevices.com/products/sabre-lite-imx6-sbc/}{Sabre @@ -499,10 +499,10 @@ /*! \target Raspberry Pi Model B (embedded Linux) - \page qee-preparing-hardware-rasberrypi.html + \page qtee-preparing-hardware-rasberrypi.html \title Preparing Raspberry Pi - \previouspage qee-installation-guide.html - \nextpage qee-building-and-running.html + \previouspage qtee-installation-guide.html + \nextpage qtee-building-and-running.html When using a \l{http://www.raspberrypi.org/}{Raspberry Pi} as a development device, following steps are required to prepare it for @@ -546,10 +546,10 @@ */ /*! - \page qee-building-and-running.html + \page qtee-building-and-running.html \title Building and Running an Example - \previouspage qee-installation-guide.html - \nextpage qee-customization.html + \previouspage qtee-installation-guide.html + \nextpage qtee-customization.html Once the installation and configuration steps for \SDK and the target device(s) are completed, it's time to test the setup. @@ -599,10 +599,10 @@ */ /*! - \page qee-customization.html + \page qtee-customization.html \title Customization - \previouspage qee-building-and-running.html - \nextpage qee-supported-platforms.html + \previouspage qtee-building-and-running.html + \nextpage qtee-supported-platforms.html \section1 Environment and Input @@ -691,10 +691,10 @@ */ /*! - \page qee-supported-platforms.html + \page qtee-supported-platforms.html \title Supported Platforms - \previouspage qee-customization.html - \nextpage qee-troubleshooting.html + \previouspage qtee-customization.html + \nextpage qtee-troubleshooting.html \section1 Supported Target Devices @@ -727,9 +727,9 @@ */ /*! - \page qee-troubleshooting.html + \page qtee-troubleshooting.html \title Troubleshooting - \previouspage qee-supported-platforms.html + \previouspage qtee-supported-platforms.html \note An updated version of this information may be available in Digia customer portal, see Known Issues in Qt Enterprise Embedded product page. -- cgit v1.2.3 From 40fdfebd2ceff38b9edd32f063bf6218e156e462 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 22 Oct 2013 15:02:26 +0200 Subject: Doc: Add license information page Discuss the product licensing and third-party license info. Change-Id: I750f95f57a006ee23c342d15a915710caee510da Reviewed-by: Eirik Aavitsland --- src/doc/src/b2qt.qdoc | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index e1e3b4b..3fc385b 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -38,6 +38,7 @@ \li \l{Building and Running an Example} \li \l{Customization} \li \l{Supported Platforms} + \li \l{License Information} \li \l{Troubleshooting} \endlist @@ -694,7 +695,7 @@ \page qtee-supported-platforms.html \title Supported Platforms \previouspage qtee-customization.html - \nextpage qtee-troubleshooting.html + \nextpage qtee-licenses.html \section1 Supported Target Devices @@ -726,6 +727,31 @@ */ +/*! + \page qtee-licenses.html + \title License Information + \previouspage qtee-supported-platforms.html + \nextpage qtee-troubleshooting.html + + \section1 Licensing + + \SDK is licensed under the Qt Enterprise commercial license. For more information, + see \l {http://qt.digia.com/licensing}. Evaluation licenses are also available, + see \l {http://qt.digia.com/Products/Qt-Enterprise-Embedded}. + + \section1 3rd Party Software Licenses + + The third-party licenses used in \SDK are listed in the file + \c {/Licenses/ThirdPartySoftware_Listing.txt}. + + \section2 Embedded Android Images + + The embedded Android platform is built from the \e {Android Open Source Project}, + source code available at \l {http://android.googlesource.com/}. The open + source licenses and notices are collected into the file + \c {/etc/NOTICE.html.gz} in the target images. +*/ + /*! \page qtee-troubleshooting.html \title Troubleshooting -- cgit v1.2.3 From 27d1ec0a2f4f5d2ee21c9b275ccdd70391eebe16 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 22 Oct 2013 14:14:03 +0200 Subject: Doc: Clarify Supported Nexus 7 model We support the Nexus 7 model from 2012. Change-Id: Icd61b3b5bb15de16b086ae174487cdca26f023c9 Reviewed-by: Eirik Aavitsland --- src/doc/src/b2qt.qdoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 3fc385b..4b8b437 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -30,7 +30,7 @@ \li \l{Installation Guide} \li \l{Preparing Hardware} \list - \li \l{Preparing Nexus 7}{Nexus 7 (embedded Android)} + \li \l{Preparing Nexus 7}{Nexus 7 (2012) (embedded Android)} \li \l{Preparing Sabre Lite i.MX 6}{Sabre Lite i.MX 6 (embedded Android and Linux)} \li \l{Preparing BeagleBoard-xM}{BeagleBoard-xM (embedded Android and Linux)} \li \l{Preparing Raspberry Pi}{Raspberry Pi Model B (embedded Linux)} @@ -228,7 +228,7 @@ \B2Q stack. These steps vary from device to device: \list - \li \l{Nexus 7 (embedded Android)} + \li \l{Nexus 7 (2012) (embedded Android)} \li \l{Sabre Lite i.MX 6 (embedded Android and Linux)} \li \l{BeagleBoard-xM (embedded Android and Linux)} \li \l{Raspberry Pi Model B (embedded Linux)} @@ -239,13 +239,13 @@ */ /*! - \target Nexus 7 (embedded Android) + \target Nexus 7 (2012) (embedded Android) \page qtee-preparing-hardware-nexus-7.html \title Preparing Nexus 7 \previouspage qtee-installation-guide.html \nextpage qtee-building-and-running.html - When using a \l{http://www.google.com/nexus/7/specs/}{Nexus 7} as a + When using a \l{http://www.google.com/nexus/7/specs/}{Nexus 7 (2012)} as a development device, following steps are required to prepare it for \B2Q. @@ -713,7 +713,7 @@ The following devices have been used as reference and are tested to work: \list - \li \l{http://www.google.com/nexus/7/specs/}{Google/Asus Nexus 7} + \li \l{http://www.google.com/nexus/7/specs/}{Google/Asus Nexus 7 (2012)} \li \l{http://beagleboard.org/hardware-xM}{BeagleBoard-xM} \li \l{http://boundarydevices.com/products/sabre-lite-imx6-sbc/}{Freescale i.MX6 Sabre Lite board (Boundary Devices)} \li \l{http://www.raspberrypi.org/faqs}{Raspberry Pi Model B} -- cgit v1.2.3 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 ++++++++++++++++++ src/doc/src/b2qt.qdoc | 20 +++++++++++--------- src/doc/src/detect-sd-card-device-name.qdocinc | 18 ++++++++++++++++++ src/doppelganger/main.cpp | 18 ++++++++++++++++++ src/doppelganger/permissioncontroller.cpp | 18 ++++++++++++++++++ src/doppelganger/permissioncontroller.h | 18 ++++++++++++++++++ src/doppelganger/schedulingpolicyservice.cpp | 18 ++++++++++++++++++ src/doppelganger/schedulingpolicyservice.h | 18 ++++++++++++++++++ src/imports/nativemedia/SurfaceTexture.cpp | 18 ++++++++++++++++++ src/imports/nativemedia/SurfaceTexture.h | 18 ++++++++++++++++++ src/imports/nativemedia/main.cpp | 18 ++++++++++++++++++ src/imports/nativemedia/omx.cpp | 18 ++++++++++++++++++ src/imports/nativemedia/omxmodule.cpp | 18 ++++++++++++++++++ src/imports/nativemedia/omxnode.cpp | 18 ++++++++++++++++++ src/imports/nativemedia/omxnode.h | 18 ++++++++++++++++++ src/imports/nativemedia/omxplayer.h | 18 ++++++++++++++++++ src/imports/nativemedia/test.qml | 18 ++++++++++++++++++ src/imports/utils/plugin.cpp | 18 ++++++++++++++++++ src/imports/wifi/pluginmain.cpp | 18 ++++++++++++++++++ src/imports/wifi/qwifimanager.cpp | 18 ++++++++++++++++++ src/imports/wifi/qwifimanager.h | 18 ++++++++++++++++++ src/imports/wifi/qwifinetwork.cpp | 18 ++++++++++++++++++ src/imports/wifi/qwifinetwork.h | 18 ++++++++++++++++++ src/imports/wifi/qwifinetworklist.cpp | 18 ++++++++++++++++++ src/imports/wifi/qwifinetworklist.h | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidaccelerometer.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidaccelerometer.h | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidambientlightsensor.cpp | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidambientlightsensor.h | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidbasesensor.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidbasesensor.h | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidgyroscope.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidgyroscope.h | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidlight.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidlight.h | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidmagnetometer.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidmagnetometer.h | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidrotationsensor.cpp | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidrotationsensor.h | 18 ++++++++++++++++++ .../sensors/eandroid/eandroidsensordevice.cpp | 18 ++++++++++++++++++ src/plugins/sensors/eandroid/eandroidsensordevice.h | 18 ++++++++++++++++++ src/qt_hw_init/main.cpp | 18 ++++++++++++++++++ src/utils/qdroidutils.cpp | 18 ++++++++++++++++++ src/utils/qdroidutils.h | 18 ++++++++++++++++++ 44 files changed, 785 insertions(+), 9 deletions(-) (limited to 'src') 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 diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 4b8b437..dd71d52 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -1,17 +1,19 @@ /**************************************************************************** ** -** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc +** All rights reserved. +** For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** Qt and Qt logos are trademarks of of Digia Corporation in Finland and/or -** other countries worldwide. All other trademarks are property of their -** respective owners. +** 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. ** -** Licensees holding valid Qt Commercial licenses may use this document in -** accordance with the Qt Commercial 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/ ** ****************************************************************************/ diff --git a/src/doc/src/detect-sd-card-device-name.qdocinc b/src/doc/src/detect-sd-card-device-name.qdocinc index 825be80..e7601c9 100644 --- a/src/doc/src/detect-sd-card-device-name.qdocinc +++ b/src/doc/src/detect-sd-card-device-name.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/ +** +****************************************************************************/ /*! //! [instructions] Plug the micro-SD card or reader into the development host PC, diff --git a/src/doppelganger/main.cpp b/src/doppelganger/main.cpp index 9255576..6813b75 100644 --- a/src/doppelganger/main.cpp +++ b/src/doppelganger/main.cpp @@ -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/ +** +****************************************************************************/ #include #include "permissioncontroller.h" diff --git a/src/doppelganger/permissioncontroller.cpp b/src/doppelganger/permissioncontroller.cpp index 06d1729..15f2313 100644 --- a/src/doppelganger/permissioncontroller.cpp +++ b/src/doppelganger/permissioncontroller.cpp @@ -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/ +** +****************************************************************************/ #include "permissioncontroller.h" #include diff --git a/src/doppelganger/permissioncontroller.h b/src/doppelganger/permissioncontroller.h index 74aeb10..2e95f79 100644 --- a/src/doppelganger/permissioncontroller.h +++ b/src/doppelganger/permissioncontroller.h @@ -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/ +** +****************************************************************************/ #ifndef PERMISSIONCONTROLLER_H #define PERMISSIONCONTROLLER_H diff --git a/src/doppelganger/schedulingpolicyservice.cpp b/src/doppelganger/schedulingpolicyservice.cpp index 27483e0..4b80739 100644 --- a/src/doppelganger/schedulingpolicyservice.cpp +++ b/src/doppelganger/schedulingpolicyservice.cpp @@ -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/ +** +****************************************************************************/ #include "schedulingpolicyservice.h" #include diff --git a/src/doppelganger/schedulingpolicyservice.h b/src/doppelganger/schedulingpolicyservice.h index 377265d..6ea12d9 100644 --- a/src/doppelganger/schedulingpolicyservice.h +++ b/src/doppelganger/schedulingpolicyservice.h @@ -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/ +** +****************************************************************************/ #ifndef SCHEDULINGPOLICYSERVICE_H #define SCHEDULINGPOLICYSERVICE_H diff --git a/src/imports/nativemedia/SurfaceTexture.cpp b/src/imports/nativemedia/SurfaceTexture.cpp index c973079..0d1cc00 100644 --- a/src/imports/nativemedia/SurfaceTexture.cpp +++ b/src/imports/nativemedia/SurfaceTexture.cpp @@ -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/ +** +****************************************************************************/ #if Q_ANDROID_VERSION_MAJOR > 4 || (Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR >= 1) #include "SurfaceTexture_4_1.cpp" #else diff --git a/src/imports/nativemedia/SurfaceTexture.h b/src/imports/nativemedia/SurfaceTexture.h index efc49c8..2df4391 100644 --- a/src/imports/nativemedia/SurfaceTexture.h +++ b/src/imports/nativemedia/SurfaceTexture.h @@ -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/ +** +****************************************************************************/ #if Q_ANDROID_VERSION_MAJOR > 4 || (Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR >= 1) #include "SurfaceTexture_4_1.h" #else diff --git a/src/imports/nativemedia/main.cpp b/src/imports/nativemedia/main.cpp index 66775f6..a0727cf 100644 --- a/src/imports/nativemedia/main.cpp +++ b/src/imports/nativemedia/main.cpp @@ -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/ +** +****************************************************************************/ #include void initializeOMX(); diff --git a/src/imports/nativemedia/omx.cpp b/src/imports/nativemedia/omx.cpp index 15307df..72d6eaa 100644 --- a/src/imports/nativemedia/omx.cpp +++ b/src/imports/nativemedia/omx.cpp @@ -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/ +** +****************************************************************************/ #include #include diff --git a/src/imports/nativemedia/omxmodule.cpp b/src/imports/nativemedia/omxmodule.cpp index e8737ce..1a5637f 100644 --- a/src/imports/nativemedia/omxmodule.cpp +++ b/src/imports/nativemedia/omxmodule.cpp @@ -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/ +** +****************************************************************************/ #include "omxnode.h" #include diff --git a/src/imports/nativemedia/omxnode.cpp b/src/imports/nativemedia/omxnode.cpp index c333622..60fbb44 100644 --- a/src/imports/nativemedia/omxnode.cpp +++ b/src/imports/nativemedia/omxnode.cpp @@ -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/ +** +****************************************************************************/ #include "omxnode.h" #include diff --git a/src/imports/nativemedia/omxnode.h b/src/imports/nativemedia/omxnode.h index 22bbb4a..d83b8fc 100644 --- a/src/imports/nativemedia/omxnode.h +++ b/src/imports/nativemedia/omxnode.h @@ -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/ +** +****************************************************************************/ #ifndef OMXNODE_H #define OMXNODE_H diff --git a/src/imports/nativemedia/omxplayer.h b/src/imports/nativemedia/omxplayer.h index 17544c1..827cb79 100644 --- a/src/imports/nativemedia/omxplayer.h +++ b/src/imports/nativemedia/omxplayer.h @@ -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/ +** +****************************************************************************/ #ifndef OMXPLAYER_H #define OMXPLAYER_H diff --git a/src/imports/nativemedia/test.qml b/src/imports/nativemedia/test.qml index 8bbd4ce..2db3256 100644 --- a/src/imports/nativemedia/test.qml +++ b/src/imports/nativemedia/test.qml @@ -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/ +** +****************************************************************************/ import QtQuick 2.0 import QtAndroidOmx 1.0 diff --git a/src/imports/utils/plugin.cpp b/src/imports/utils/plugin.cpp index 4b3f6e1..6e53aee 100644 --- a/src/imports/utils/plugin.cpp +++ b/src/imports/utils/plugin.cpp @@ -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/ +** +****************************************************************************/ #include #include diff --git a/src/imports/wifi/pluginmain.cpp b/src/imports/wifi/pluginmain.cpp index c9dac53..58aa590 100644 --- a/src/imports/wifi/pluginmain.cpp +++ b/src/imports/wifi/pluginmain.cpp @@ -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/ +** +****************************************************************************/ #include "qwifimanager.h" #include diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp index 1ba3d64..b2b9363 100644 --- a/src/imports/wifi/qwifimanager.cpp +++ b/src/imports/wifi/qwifimanager.cpp @@ -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/ +** +****************************************************************************/ #include "qwifimanager.h" #include diff --git a/src/imports/wifi/qwifimanager.h b/src/imports/wifi/qwifimanager.h index 5fd74f5..59f2b44 100644 --- a/src/imports/wifi/qwifimanager.h +++ b/src/imports/wifi/qwifimanager.h @@ -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/ +** +****************************************************************************/ #ifndef QWIFIMANAGER_H #define QWIFIMANAGER_H diff --git a/src/imports/wifi/qwifinetwork.cpp b/src/imports/wifi/qwifinetwork.cpp index 5de8711..5b74301 100644 --- a/src/imports/wifi/qwifinetwork.cpp +++ b/src/imports/wifi/qwifinetwork.cpp @@ -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/ +** +****************************************************************************/ #include "qwifinetwork.h" QWifiNetwork::QWifiNetwork() diff --git a/src/imports/wifi/qwifinetwork.h b/src/imports/wifi/qwifinetwork.h index 8bcb410..e287d7e 100644 --- a/src/imports/wifi/qwifinetwork.h +++ b/src/imports/wifi/qwifinetwork.h @@ -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/ +** +****************************************************************************/ #ifndef QWIFINETWORK_H #define QWIFINETWORK_H diff --git a/src/imports/wifi/qwifinetworklist.cpp b/src/imports/wifi/qwifinetworklist.cpp index e7fa92d..2e1500b 100644 --- a/src/imports/wifi/qwifinetworklist.cpp +++ b/src/imports/wifi/qwifinetworklist.cpp @@ -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/ +** +****************************************************************************/ #include "qwifinetworklist.h" #include diff --git a/src/imports/wifi/qwifinetworklist.h b/src/imports/wifi/qwifinetworklist.h index f6e134c..f9727f3 100644 --- a/src/imports/wifi/qwifinetworklist.h +++ b/src/imports/wifi/qwifinetworklist.h @@ -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/ +** +****************************************************************************/ #ifndef QWIFINETWORKLIST_H #define QWIFINETWORKLIST_H diff --git a/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp b/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp index 1837990..b73b9b6 100644 --- a/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp +++ b/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp @@ -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/ +** +****************************************************************************/ #include EAndroidAccelerometer::EAndroidAccelerometer(int type, QSensor *sensor) diff --git a/src/plugins/sensors/eandroid/eandroidaccelerometer.h b/src/plugins/sensors/eandroid/eandroidaccelerometer.h index f3c618d..1eaa8f9 100644 --- a/src/plugins/sensors/eandroid/eandroidaccelerometer.h +++ b/src/plugins/sensors/eandroid/eandroidaccelerometer.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDACCELEROMETER_H #define EANDROIDACCELEROMETER_H diff --git a/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp b/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp index 212733c..e1f285f 100644 --- a/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp @@ -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/ +** +****************************************************************************/ #include "eandroidambientlightsensor.h" EAndroidAmbientLightSensor::EAndroidAmbientLightSensor(int type, QSensor *sensor) diff --git a/src/plugins/sensors/eandroid/eandroidambientlightsensor.h b/src/plugins/sensors/eandroid/eandroidambientlightsensor.h index 632164d..55aacba 100644 --- a/src/plugins/sensors/eandroid/eandroidambientlightsensor.h +++ b/src/plugins/sensors/eandroid/eandroidambientlightsensor.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDAMBIENTLIGHTSENSOR_H #define EANDROIDAMBIENTLIGHTSENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidbasesensor.cpp b/src/plugins/sensors/eandroid/eandroidbasesensor.cpp index f21961c..005759b 100644 --- a/src/plugins/sensors/eandroid/eandroidbasesensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidbasesensor.cpp @@ -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/ +** +****************************************************************************/ #include #include diff --git a/src/plugins/sensors/eandroid/eandroidbasesensor.h b/src/plugins/sensors/eandroid/eandroidbasesensor.h index 4e282df..af3d6ea 100644 --- a/src/plugins/sensors/eandroid/eandroidbasesensor.h +++ b/src/plugins/sensors/eandroid/eandroidbasesensor.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDBASESENSOR_H #define EANDROIDBASESENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidgyroscope.cpp b/src/plugins/sensors/eandroid/eandroidgyroscope.cpp index 601415f..c3b838e 100644 --- a/src/plugins/sensors/eandroid/eandroidgyroscope.cpp +++ b/src/plugins/sensors/eandroid/eandroidgyroscope.cpp @@ -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/ +** +****************************************************************************/ #include "eandroidgyroscope.h" #include diff --git a/src/plugins/sensors/eandroid/eandroidgyroscope.h b/src/plugins/sensors/eandroid/eandroidgyroscope.h index 65c531f..5ee53b8 100644 --- a/src/plugins/sensors/eandroid/eandroidgyroscope.h +++ b/src/plugins/sensors/eandroid/eandroidgyroscope.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDGYROSCOPE_H #define EANDROIDGYROSCOPE_H diff --git a/src/plugins/sensors/eandroid/eandroidlight.cpp b/src/plugins/sensors/eandroid/eandroidlight.cpp index f9cce98..3f292e8 100644 --- a/src/plugins/sensors/eandroid/eandroidlight.cpp +++ b/src/plugins/sensors/eandroid/eandroidlight.cpp @@ -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/ +** +****************************************************************************/ #include EAndroidLight::EAndroidLight(int type, QSensor *sensor) diff --git a/src/plugins/sensors/eandroid/eandroidlight.h b/src/plugins/sensors/eandroid/eandroidlight.h index 3929dea..7317763 100644 --- a/src/plugins/sensors/eandroid/eandroidlight.h +++ b/src/plugins/sensors/eandroid/eandroidlight.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDLIGHT_H #define EANDROIDLIGHT_H diff --git a/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp b/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp index 8747d45..6f14e7e 100644 --- a/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp +++ b/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp @@ -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/ +** +****************************************************************************/ #include "eandroidmagnetometer.h" EAndroidMagnetometer::EAndroidMagnetometer(int type, QSensor *sensor) diff --git a/src/plugins/sensors/eandroid/eandroidmagnetometer.h b/src/plugins/sensors/eandroid/eandroidmagnetometer.h index 5cb3842..3cc1715 100644 --- a/src/plugins/sensors/eandroid/eandroidmagnetometer.h +++ b/src/plugins/sensors/eandroid/eandroidmagnetometer.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDMAGNETOMETER_H #define EANDROIDMAGNETOMETER_H diff --git a/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp b/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp index 0d9bfde..93d520a 100644 --- a/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp @@ -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/ +** +****************************************************************************/ #include "eandroidrotationsensor.h" #include diff --git a/src/plugins/sensors/eandroid/eandroidrotationsensor.h b/src/plugins/sensors/eandroid/eandroidrotationsensor.h index 6139001..9499ae2 100644 --- a/src/plugins/sensors/eandroid/eandroidrotationsensor.h +++ b/src/plugins/sensors/eandroid/eandroidrotationsensor.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDROTATIONSENSOR_H #define EANDROIDROTATIONSENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidsensordevice.cpp b/src/plugins/sensors/eandroid/eandroidsensordevice.cpp index 7e4caed..c8e5912 100644 --- a/src/plugins/sensors/eandroid/eandroidsensordevice.cpp +++ b/src/plugins/sensors/eandroid/eandroidsensordevice.cpp @@ -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/ +** +****************************************************************************/ #include EventReaderThread::EventReaderThread(EAndroidSensorDevice *device) : diff --git a/src/plugins/sensors/eandroid/eandroidsensordevice.h b/src/plugins/sensors/eandroid/eandroidsensordevice.h index b34580e..fcf022a 100644 --- a/src/plugins/sensors/eandroid/eandroidsensordevice.h +++ b/src/plugins/sensors/eandroid/eandroidsensordevice.h @@ -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/ +** +****************************************************************************/ #ifndef EANDROIDSENSORDEVICE_H #define EANDROIDSENSORDEVICE_H diff --git a/src/qt_hw_init/main.cpp b/src/qt_hw_init/main.cpp index 3419c21..ba9f49b 100644 --- a/src/qt_hw_init/main.cpp +++ b/src/qt_hw_init/main.cpp @@ -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/ +** +****************************************************************************/ #include "../utils/qdroidutils.h" #include diff --git a/src/utils/qdroidutils.cpp b/src/utils/qdroidutils.cpp index da443c9..2a9c94c 100644 --- a/src/utils/qdroidutils.cpp +++ b/src/utils/qdroidutils.cpp @@ -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/ +** +****************************************************************************/ #include "qdroidutils.h" #include #include diff --git a/src/utils/qdroidutils.h b/src/utils/qdroidutils.h index b0f9061..9d833bb 100644 --- a/src/utils/qdroidutils.h +++ b/src/utils/qdroidutils.h @@ -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/ +** +****************************************************************************/ #ifndef QDROIDUTILS_H #define QDROIDUTILS_H -- cgit v1.2.3 From 6571cbdc59025b54de648f1d87d3578a4612d962 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 5 Dec 2013 14:09:51 +0100 Subject: Doc: move overview info to a new topic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add some information from the Qt Enterprise Embedded site to explain the basic concepts that the reader will encounter in the installation chapter. Change-Id: I0d6ed724bb1e502850035744ac099f9ca9546b1a Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 86 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 24 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index dd71d52..0bb03b5 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -20,15 +20,25 @@ /*! \contentspage{index.html}{Qt Enterprise Embedded} \page index.html - \nextpage qtee-installation-guide.html + \nextpage qtee-overview.html \title Qt Enterprise Embedded + \SDK provides a fully-integrated solution to get you started immediately + with software development on your embedded device with a tailored user + experience for embedded Linux and embedded Android. \SDK contains the tools + you need for fast, easy, and fully-integrated embedded device application + development. It comes with \B2Q, a light-weight UI stack for embedded + systems, and the Qt Creator integrated development environment (IDE) with + preconfigured build targets for hardware platforms, as well as an emulator + for testing the applications. + \e{\b{IMPORTANT:} Make sure to follow the \l{Installation Guide} closely!} \section1 Contents \list + \li \l{About Qt Enterprise Embedded} \li \l{Installation Guide} \li \l{Preparing Hardware} \list @@ -43,27 +53,59 @@ \li \l{License Information} \li \l{Troubleshooting} \endlist +*/ - \section1 About \SDK - - \SDK includes the \B2Q stack, providing a complete software development - package for creating applications on embedded devices. It comes with - the Qt Creator IDE with preconfigured build targets for hardware - platforms as well as an \l{Emulator}{emulator}. +/*! + \contentspage{index.html}{Qt Enterprise Embedded} + \page qtee-overview.html + \previouspage index.html + \nextpage qtee-installation-guide.html - \section1 What is \B2Q? + \title About Qt Enterprise Embedded - \e{\b{\B2Q}} is a light-weight UI stack for embedded systems, based on the - \l{http://qt.digia.com/}{Qt Framework} by Digia, offering an elegant - means of developing beautiful and performant embedded devices. It supports - two different operating systems: + \SDK has two main parts: \list - \li \b{\B2QA} places Qt on top of an Android (version 4.1 or higher) - kernel/baselayer. + \li Development environment that is installed on a Linux development + desktop by using an online installer. + \li \B2Q + \endlist - \li \b{\B2QL} places Qt on top of an Linux kernel/baselayer, built - using Yocto 1.4 'Dylan' release. + \section1 About the Development Environment + + The development is done with the Qt Enterprise libraries and device + deployment can be done with one click directly from Qt Creator to a device + connected via USB. Alternatively, you can deploy the application locally + directly to the \B2Q Emulator that is running the full target software stack + as in the device. + + As with any Qt based application, the same application can be deployed to + desktop and mobile OS targets as well. + + \section1 About \B2Q + + \e{\b{\B2Q}} is a light-weight, Qt-optimized, full software stack for + embedded systems that is installed into the actual target device. This is + done by flashing the device’s memory card or device's internal memory + directly with a pre-built image that comes with the development environment. + + \B2Q supports two different operating systems: + + \list + \li \b{\B2QA} where the software stack is based on the Android Kernel + (version 4.1 or higher) and selected middleware. It includes a lean + software stack where Qt/QML replaces the top Java graphical layer + and removes the Zygote process layer as well the Android home screen + enabling better and faster development where modern UIs are at the + forefront. + + \li \b{\B2QL} where the software stack is using the traditional embedded + Linux kernel built with the Yocto Poky reference system (Yocto 1.4 + \e Dylan release). Because of its Yocto compliance, the Embedded + Linux variant is designed for great customization possibilities. + It contains only components required in the embedded device, + resulting in smaller image sizes while keeping valuable development + tools available. \endlist Both versions have been tested and verified on a number of different @@ -74,7 +116,7 @@ \l{http://qt.digia.com/}{Qt} is a full development framework with tools designed to streamline the creation of applications and user interfaces - for desktop, embedded and mobile platforms. + for desktop, embedded, and mobile platforms. \list \li \b{Qt Framework} - intuitive APIs for C++ @@ -88,8 +130,8 @@ \endlist With Qt, you can reuse code efficiently to target multiple platforms - with one code base. The modular C++ class library and developer tools - enables developers to create applications for one platform and easily + with one code base. The modular C++ class library and development tools + enable developers to create applications for one platform and easily build and run to deploy also on other platforms. @@ -108,16 +150,12 @@ \e{Dalvik virtual machine} is not running in \B2Q, resulting in faster startup times, lower memory consumption and overall better performance. - - \b{\B2QL} is build from scratch using Yocto 1.4 tools - to contain only components required in the embedded device, resulting - in smaller image sizes while keeping valuable development tools available. */ /*! \page qtee-installation-guide.html \title Installation Guide - \previouspage index.html + \previouspage qtee-overview.html \nextpage qtee-preparing-hardware.html \e{IMPORTANT: \SDK requires the following installation steps to be followed closely.} -- cgit v1.2.3 From 62e3601a82c60cfa41c3b7b6981c3f6bdca7d546 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 5 Dec 2013 14:52:52 +0100 Subject: Doc: move related sections together in TOC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Place License Information last. Change-Id: If5122f5bf0c9aeee544fe999cb44442729f26abe Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 0bb03b5..378f092 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -40,6 +40,7 @@ \list \li \l{About Qt Enterprise Embedded} \li \l{Installation Guide} + \li \l{Supported Platforms} \li \l{Preparing Hardware} \list \li \l{Preparing Nexus 7}{Nexus 7 (2012) (embedded Android)} @@ -49,9 +50,8 @@ \endlist \li \l{Building and Running an Example} \li \l{Customization} - \li \l{Supported Platforms} - \li \l{License Information} \li \l{Troubleshooting} + \li \l{License Information} \endlist */ @@ -156,7 +156,7 @@ \page qtee-installation-guide.html \title Installation Guide \previouspage qtee-overview.html - \nextpage qtee-preparing-hardware.html + \nextpage qtee-supported-platforms.html \e{IMPORTANT: \SDK requires the following installation steps to be followed closely.} @@ -260,7 +260,7 @@ /*! \page qtee-preparing-hardware.html \title Preparing Hardware - \previouspage qtee-installation-guide.html + \previouspage qtee-supported-platforms.html \nextpage qtee-building-and-running.html Before deploying and testing your Qt application on hardware, the @@ -589,7 +589,7 @@ /*! \page qtee-building-and-running.html \title Building and Running an Example - \previouspage qtee-installation-guide.html + \previouspage qtee-preparing-hardware.html \nextpage qtee-customization.html Once the installation and configuration steps for \SDK and the @@ -643,7 +643,7 @@ \page qtee-customization.html \title Customization \previouspage qtee-building-and-running.html - \nextpage qtee-supported-platforms.html + \nextpage qtee-troubleshooting.html \section1 Environment and Input @@ -734,8 +734,8 @@ /*! \page qtee-supported-platforms.html \title Supported Platforms - \previouspage qtee-customization.html - \nextpage qtee-licenses.html + \previouspage qtee-installation-guide.html + \nextpage qtee-preparing-hardware.html \section1 Supported Target Devices @@ -770,8 +770,7 @@ /*! \page qtee-licenses.html \title License Information - \previouspage qtee-supported-platforms.html - \nextpage qtee-troubleshooting.html + \previouspage qtee-troubleshooting.html \section1 Licensing @@ -795,7 +794,8 @@ /*! \page qtee-troubleshooting.html \title Troubleshooting - \previouspage qtee-supported-platforms.html + \previouspage qtee-customization.html + \nextpage qtee-licenses.html \note An updated version of this information may be available in Digia customer portal, see Known Issues in Qt Enterprise Embedded product page. -- 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 +++++++++++---------- src/doc/src/b2qt.qdoc | 76 +++++++++++++++-------------- 2 files changed, 69 insertions(+), 62 deletions(-) (limited to 'src') 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] diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 378f092..f682f13 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -158,14 +158,15 @@ \previouspage qtee-overview.html \nextpage qtee-supported-platforms.html - \e{IMPORTANT: \SDK requires the following installation steps to be followed closely.} + To successfully set up \SDK, you must closely follow the instructions in + this section and perform all the described tasks. In case of problems, see the \l{Troubleshooting} information and the - Known Issues in Qt Enterprise Embedded product page in Digia customer + \e {Known Issues} on the Qt Enterprise Embedded product page in the Digia customer portal. \target Requirements for Development Host - \section1 0. Requirements for Development Host + \section1 Requirements for Development Host A 64-bit Linux system is required to install and use \SDK. Instructions in this documentation assume Ubuntu Linux 64-bit 12.04 LTS or later. @@ -176,8 +177,8 @@ \section1 1. Installing 32-bit Support Libraries Some of the build tools in \SDK are 32-bit programs, and on 64-bit - systems they require that support libraries for running 32-bit - code are present in the system. To install the required packages + systems they require support libraries for running 32-bit code. To install + the required packages in Ubuntu, use the following command in a terminal: \code @@ -195,56 +196,60 @@ sudo apt-get install virtualbox \endcode - \b{Configuring VirtualBox} + To configure VirtualBox: - Open VirtualBox network settings: Select \b{File > Preferences...} - and click on the \b{Network} tab. Create a new network named - \e{vboxnet0} and edit its properties: - - \list - \li Change IPv4 address to 192.168.56.1 and IPv4 network mask to 255.255.255.0. - \li Check \b{Enable Server} in \b{DCHP Server} tab. - \li Change server address to 192.168.56.1. - \li Change both the lower and upper address bounds to 192.168.56.101. + \list 1 + \li Start the VirtualBox user interface. + \li Select \b{File > Preferences} > \b{Network} to open VirtualBox + network settings. + \li Create a new network named \e{vboxnet0} and edit its properties: + + \list 1 + \li Change the IPv4 address to \c{192.168.56.1} and the IPv4 network + mask to \c{255.255.255.0}. + \li In the \b{DCHP Server} tab, select the \b{Enable Server} check + box. + \li Change the server address to \c{192.168.56.1}. + \li Change both the lower and upper address bounds to + \c{192.168.56.101}. + \endlist \endlist \section1 3. Installing \SDK - If you have not already installed \SDK, do it as follows. + \list 1 - After downloading the binary installer, make sure it is executable either by + \li Download the binary \SDK installer, and make sure it is executable + by using one of the following methods: \list - \li Using \c{chmod +x } command, or - \li Right-clicking on the file, selecting \b{Properties}, and checking - \b{Allow executing file as program} on the \b{Permissions} tab. + \li Enter the \c{chmod +x } command. + \li Right-click the file, and select \b{Properties} > + \b{Permissions} > \b{Allow executing file as program}. \endlist - Run the installer and follow its instructions. + \li Run the installer and follow its instructions. + + \endlist The installer will let you select a directory where \SDK will be - installed. In the rest of this documentation, that directory is referred + installed. In this documentation, the installation directory is referred to as \b{\c{}}. The default installation directory is \tt{~/Qt}. \target Installing Boot to Qt on Target Devices \section1 4. Install \B2Q on Target Devices - \e{If targeting only the emulator, this step may be skipped} + \e{If you target only the emulator, you can skip this step.} - Before deploying and testing your Qt application on hardware, the - target device needs to be flashed with an image that contains the - \B2Q stack. These steps vary from device to device. See the - following chapter and follow the instructions specific to - your device. - - \list - \li \l {Preparing Hardware} - \endlist + Before you can deploy and test your Qt application on hardware, you must + flash the target device with an image that contains the + \B2Q stack. The steps vary from device to device. Follow the instructions + specific to your device in \l {Preparing Hardware}. \section1 5. Setting up USB Access to Embedded Devices - \e{If targeting only the emulator, this step may be skipped} + \e{If you target only the emulator, you can skip this step.} \include b2qt-post-install-setup.qdocinc setting up usb access @@ -252,9 +257,8 @@ \include b2qt-post-install-setup.qdocinc configuring device kit - \b {You are now ready to start developing for your device!} - - See \l{Building and Running an Example} + You are now ready to start developing for your device. + For more information, see \l{Building and Running an Example}. */ /*! -- cgit v1.2.3 From 8beaad9609ce1bf51069450b2a95117b957c1e2f Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 9 Dec 2013 12:56:07 +0100 Subject: Doc: edit the supported devices topic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the capitalization of units of measurement and use spaces between the units and the numbers. Edit the leading sentence to the list of supported devices. Change-Id: I440a55f855d687ce46d3188373a4624b775529a0 Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index f682f13..a11a561 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -749,13 +749,13 @@ Approximate minimal hardware requirements for running \B2Q are: \list - \li 256Mb of RAM - \li 500Mhz CPU, 1Ghz preferred for 60 FPS velvet-smooth UI + \li 256 MB of RAM + \li 500 MHz CPU, 1 GHz preferred for 60-FPS velvet-smooth UI \li OpenGL ES 2.0 support \li Android 4.0+ compatible hardware \endlist - The following devices have been used as reference and are tested to work: + \B2Q has been tested to work on the following reference devices: \list \li \l{http://www.google.com/nexus/7/specs/}{Google/Asus Nexus 7 (2012)} \li \l{http://beagleboard.org/hardware-xM}{BeagleBoard-xM} -- cgit v1.2.3 From 5160df08e58a7901eb0836649184afcc9d492b05 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 9 Dec 2013 13:00:27 +0100 Subject: Doc: edit troubleshooting topic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Edit for grammar and style. Use QDoc commands consistently. Change-Id: I2faf83811632b1640b504f538a714d0d7a9243b6 Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index a11a561..c6a7769 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -801,17 +801,18 @@ \previouspage qtee-customization.html \nextpage qtee-licenses.html - \note An updated version of this information may be available in Digia customer portal, - see Known Issues in Qt Enterprise Embedded product page. + \note An updated version of this information may be available in the Digia + customer portal, in the \e{Known Issues} section on the \SDK product page. \section1 General Issues \section2 I have problems deploying/launching the application in Qt Creator - Check if the device is properly connected to the PC via USB. + Check that the device is properly connected to the development host via USB + or Ethernet (depending on the device). See \l{Connectivity Issues}. - If using the emulator, see \l{Installing VirtualBox}{Configuring VirtualBox}. + If using the emulator, see \l{Installing VirtualBox}. \section2 I have problems deploying/launching a Qt or Qt Quick example application @@ -831,8 +832,8 @@ \section2 Booting Sabre Lite i.MX 6 stops with \e {6x_bootscript not found} error Check the U-Boot version number. It should start with either \c{2012} or \c{2013}. - If it is \c{2009.xx}, an upgrade of the bootloader is required. See information and - instructions here: + If it is \c{2009.xx}, an upgrade of the bootloader is required. For more + information, see: \list \li \l http://boundarydevices.com/6q_bootscript/ @@ -841,8 +842,9 @@ \section2 How do I restore my Nexus 7 to factory settings? - Goto \l{https://developers.google.com/android/nexus/images} and - download the correct file for your device. Unpack it, and then + Go to \l{https://developers.google.com/android/nexus/images} and + download the correct file for your device. Unpack it, and then enter the + following commands: \code /Tools/b2qt/adb reboot bootloader @@ -851,10 +853,10 @@ \section2 How do I shut down the Nexus 7? - If the \B2Q demo launcher is running, start the "Launcher - Settings" app, and press the "Power Off" button. + If the \B2Q demo launcher is running, start the \b {Launcher + Settings} app, and press the power button to power off the device. - Otherwise, make sure the Nexus 7 is connected to your PC with USB, and run + Otherwise, make sure the Nexus 7 is connected to the development host, and run the following command in a terminal: \code /Tools/b2qt/adb shell reboot -p @@ -865,7 +867,8 @@ \section2 Trying to build for the emulator target fails with error message \e{make: i686-android-linux-g++: Command not found} - You need to install proper libraries in order to run 32-bit programs in 64-bit Linux operating system. + You need to install support libraries in order to run 32-bit programs in a + 64-bit Linux operating system. See \l{Installing 32-bit Support Libraries}. @@ -880,7 +883,7 @@ See \l{Customization}. - Note that hotplugging does not currently work; any input device + \note Hotplugging does not currently work, and therefore, any input device must be present at boot time to be recognized. \section2 Application stops with \e{EGLFS: OpenGL windows cannot be mixed with others.} @@ -906,7 +909,7 @@ \section2 adb fails with "error: more than one device and emulator" - You have to specify which android device you want \c{adb} to talk + You have to specify which Android device you want \c{adb} to talk to, using adb's \c{-s } option. Use the following command to find to see the serial number of the connected devices: @@ -915,17 +918,17 @@ /Tools/b2qt/adb devices \endcode - \section2 The emulator cannot connect to the internet + \section2 The emulator cannot connect to the Internet - By default, the Virtualbox is configured to use host-only network, so external + By default, the VirtualBox is configured to use a host-only network, so external connections do not work in the emulator. - You may be able to enable internet connectivity with another + You may be able to enable Internet connectivity with another virtual network adapter in NAT mode by adapting \l{http://askubuntu.com/questions/293816/in-virtualbox-how-do-i-set-up-host-only-virtual-machines-that-can-access-the-in}{these} instructions. - \section2 The emulator is stuck in 'Waiting for display data' or fails to start properly + \section2 The emulator is stuck in \e{Waiting for display data} or fails to start properly Check the output of the following command: @@ -946,7 +949,7 @@ And then close the emulator and retry. - \section2 What is the user and password to access my embedded Linux device + \section2 What are the user and password to access my embedded Linux device? Embedded Linux devices can be accessed using user \c{root} and an empty password. -- cgit v1.2.3 From d3fc80299709a9a872acacfc7cc2c9a8934ec53b Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 9 Dec 2013 16:35:37 +0100 Subject: Doc: edited the customization topic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Edited for style and grammar. Change-Id: I57a9f72db0300c475b752a20bb613caa9a41b570 Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index c6a7769..704600e 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -656,30 +656,29 @@ {/system/bin/appcontroller.conf} in embedded Android devices and in \c{/etc/appcontroller.conf} in embedded Linux devices. - This file can be customized if targeting a hardware device that - has different input devices than what the \B2Q stack is configured + You can customize this file if you target a hardware device that + has other input devices than the ones that the \B2Q stack is configured for by default. - Note that on some devices, the root file system (where this file - resides) is mounted read-only at boot time. It needs to be - remounted read-write to allow modification. The following command - does that: + On some devices, the root file system (where this file + resides) is mounted read-only at boot time. To allow modification, + remount it read-write by entering the following command: \code /Tools/b2qt/adb remount \endcode - In the \c{appcontroller.conf} file the input devices are + In the \c{appcontroller.conf} file, the input devices are specified by the lines similar to these: \code env=QT_QPA_GENERIC_PLUGINS=evdevtouch:/dev/input/event0 \endcode - Usually there is no need to change this setting. USB input devices like - keyboards and mice are automatically recognized. The mouse pointer is shown + Usually, you do not need to change this setting. USB input devices, such as + keyboards and mice, are automatically recognized. The mouse pointer is shown automatically if a mouse is connected. - Note however that hotplugging may not work, meaning that the input - devices, like keyboard and mouse, have to be connected at boot + However, hotplugging may not work, which means that the input + devices, such as a keyboard and mouse, have to be connected at boot time. On some devices, for example the i.MX6 Sabre Lite, the touchscreen device is @@ -688,18 +687,21 @@ \section1 Booting to a Custom Application - After you have deployed your own application to the device it will be launched instead - of the \B2Q demo launcher on boot. To prevent this behavior you have to remove - this step from the build steps of your project's run configuration. + After you have deployed your own application to the device, it will be + launched on boot, instead of the \B2Q demo launcher. To prevent this + behavior, remove the \b {Make this application the default one} step from + the \b{Run Settings} for your project in the Qt Creator \b Projects mode. - To remove your application from the default startup use the following command: + To remove your application from the default startup, use the following + command: \code /Tools/b2qt/adb shell appcontroller --remove-default \endcode \section1 Switching Between Portrait and Landscape Views - Depending on a device screen dimensions and application requirements it might be desirable + Depending on device screen dimensions and application requirements, it might + be desirable to change the default view orientation. The following example shows how to rotate your application in QML. -- cgit v1.2.3 From 11daeacb2580a36e8cf267d370d7f40195a16e58 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 9 Dec 2013 12:34:22 +0100 Subject: Doc: edit the building and running topi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Edit for grammar and style. Change-Id: I61bdbd5dbd4adc8badfe7e5aebe0c43f2a7a875e Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 704600e..7a96856 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -596,19 +596,17 @@ \previouspage qtee-preparing-hardware.html \nextpage qtee-customization.html - Once the installation and configuration steps for \SDK and the - target device(s) are completed, it's time to test the setup. - - First, make sure your device is powered up and connected to the - development host via USB. - - Then, follow these steps to create and run a simple \l{Qt Quick} - application on the device: + After you complete the installation and configuration steps for \SDK and the + target devices, you can test the setup by creating a simple \l{Qt Quick} + application and running it on the device: \list 1 - \li Open \b{File > New File or Project}, select - \b{Qt Quick 2 Application (Built-in Types)} and click \b{Choose...}. - \li In \b{Kit Selection} dialog, select the kit(s) for your + \li Make sure that your device is powered up and connected to the + development host. + \li In Qt Creator, select \b{File > New File or Project} > + \b Applications > \b{Qt Quick 2 Application (Built-in Types)} > + \b{Choose}. + \li In the \b{Kit Selection} dialog, select the kits for your devices. You can also select the emulator kit to test running the project in the emulator. \li Click \b{Next} and finish the wizard. @@ -619,23 +617,23 @@ \section1 Setting Up an Already Existing Project for Deployment - The projects generated by Qt Creator will always have the correct settings + The projects generated by Qt Creator always have the correct settings for deployment on the device or emulator. However, existing projects may need some changes. As a general rule, application binaries and resources (such as QML files and - images) are deployed under \c {/data/user/qt/} directory. - Therefore, the \c path variable for \c INSTALLS target(s) need to be adjusted - accordingly in .pro files: + images) are deployed to the \c {/data/user/qt/} directory. + Therefore, the \c path variable for the \c INSTALLS targets needs to be adjusted + accordingly in .pro files. - For example, the following: + For example, change the following \c target.path value: \code target.path = ... INSTALLS += target \endcode - should be migrated to: + to: \code target.path = /data/user/qt/ -- 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 ++- src/doc/src/b2qt.qdoc | 185 +++++++++++++------------ src/doc/src/detect-sd-card-device-name.qdocinc | 16 +-- 3 files changed, 114 insertions(+), 110 deletions(-) (limited to 'src') 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 diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 7a96856..4169cff 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -267,8 +267,8 @@ \previouspage qtee-supported-platforms.html \nextpage qtee-building-and-running.html - Before deploying and testing your Qt application on hardware, the - target device needs to be flashed with an image that contains the + Before you can deploy and test your Qt application on hardware, you must + flash the target device with an image that contains the \B2Q stack. These steps vary from device to device: \list @@ -278,7 +278,7 @@ \li \l{Raspberry Pi Model B (embedded Linux)} \endlist - If you are only using the emulator, you can skip this step + If you use only the emulator, you can skip this step and continue straight to \l {Building and Running an Example}. */ @@ -289,39 +289,45 @@ \previouspage qtee-installation-guide.html \nextpage qtee-building-and-running.html - When using a \l{http://www.google.com/nexus/7/specs/}{Nexus 7 (2012)} as a - development device, following steps are required to prepare it for + Take the following steps to prepare a + \l{http://www.google.com/nexus/7/specs/}{Nexus 7 (2012)} for \B2Q. \section1 Unlocking Nexus 7 Bootloader - The Nexus 7 Bootloader has to be unlocked to allow custom software - to be installed. This has to be done only once. + You must unlock the Nexus 7 Bootloader to be able to install custom + software. You need to do this only once. \list 1 \li Power down the device. - \li Connect it to the development host with a USB cable. - \li Start the Nexus up in \e{fastboot} mode: Press the power button for a second, and then keep the Volume Down key pressed, until you see a screen with a green robot with its front panel open. Note: If you get the ordinary startup screen instead, just power it down and try again. - \li On the development host, give the command + \li Connect the device to the development host with a USB cable. + \li To start the Nexus up in \e{fastboot} mode, press the power button + for a second, and then keep the \b {Volume Down} key pressed down, + until you see a screen with a green robot with its front panel open. + \note If the ordinary startup screen appears instead, power down the + device and try again. + \li On the development host, enter the following command: \code sudo /Tools/b2qt/fastboot oem unlock \endcode - The Nexus screen will ask if you want to unlock the bootloader. Press power button to confirm. + \li Press the power button to confirm that you want to unlock the + bootloader when the prompt appears on the Nexus screen. \li Wait a few seconds, and check that the text line stating the \c{LOCK STATE} now says \c{UNLOCKED}. \endlist \section1 Updating a Nexus 7 with \B2Q Images - \note \b{It is important that the steps in this section are repeated - every time after updating \SDK.} + \note It is important that you repeat the steps in this section after you + update \SDK. - An unlocked Nexus 7 device can now be updated with a \B2Q image. + To update an unlocked Nexus 7 device with a \B2Q image: - To do so, first make sure that the device is in \e{fastboot} mode - (see above), and connected to the development host via USB. + \list 1 + \li Make sure that the device is in \e{fastboot} mode and that it is + connected to the development host via USB. - Then, re-flash the \e{boot}, \e{system}, and \e{userdata} partitions on the - device, using the following commands in the order they are listed: + \li Re-flash the \e{boot}, \e{system}, and \e{userdata} partitions on the + device, by entering the following commands in the following order: \code cd @@ -330,18 +336,21 @@ sudo ./Tools/b2qt/fastboot flash userdata Boot2Qt-1.0/nexus7-eAndroid/images/data.img \endcode - Once the flashing is completed successfully, reboot the device: + \li Once the flashing is completed successfully, reboot the device: \code sudo ./Tools/b2qt/fastboot reboot \endcode - \note Until the next step is performed, the Nexus 7 will not - boot correctly (the screen will only show the "Google" logo). + \endlist + + \note You must install proprietary drivers for the Nexus 7 to boot + correctly. Until then, the screen will only show the "Google" logo, + instead of the \B2Q welcome screen or demo. \section1 Installing Proprietary Drivers - Download the proprietary drivers for your Nexus 7. The following script will download the third + Download the proprietary drivers for your Nexus 7. The following script downloads the third party drivers from \l{https://developers.google.com/android/nexus/drivers#grouperjdq39} {https://developers.google.com/android/nexus/drivers#grouperjdq39} \code @@ -349,15 +358,14 @@ ./Boot2Qt-1.0/nexus7-eAndroid/images/download.sh \endcode - \note Only the version "Android 4.2.2 (JDQ39 to JDQ39E)" will work with the current \B2Q image. - - Make sure your Nexus 7 is powered up, is \e{not} in fastboot mode, - and is connected to the computer via USB. + \note Only the version "Android 4.2.2 (JDQ39 to JDQ39E)" works with the + current \B2Q image. - Then, follow these steps to update the Nexus 7: - \note Make sure you have read the license terms enclosed in each individual extractor + To install the drivers to Nexus 7: \list 1 + \li Power up the device and connect it to the development host via USB. + Also check that the device is \e{not} in fastboot mode. \li Run the driver extractors: \code cd Boot2Qt-1.0/nexus7-eAndroid/images/drivers @@ -366,18 +374,20 @@ ./extract-invensense-grouper.sh cd - \endcode + \note Carefully read the license terms enclosed in each individual + extractor. \li Find out the serial number of the connected Nexus 7 device: \code ./Tools/b2qt/adb devices \endcode - \li Deploy the drivers to your device using the following command: + \li Deploy the drivers to your device: \code ./Boot2Qt-1.0/nexus7-eAndroid/images/deploy.sh \endcode \endlist - After the installation is complete, power up the device and confirm that it shows - a \B2Q welcome screen and/or demo. + After the installation is complete, power up the device and check that + the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -387,9 +397,8 @@ \include b2qt-post-install-setup.qdocinc configuring device kit - \b {You are now ready to start developing for your device!} - - See \l{Building and Running an Example} + You are now ready to start developing for your device. For more information, + see \l{Building and Running an Example}. */ /*! @@ -399,20 +408,20 @@ \previouspage qtee-installation-guide.html \nextpage qtee-building-and-running.html - When using a \l{http://beagleboard.org/hardware-xM}{BeagleBoard-xM} as a - development device, following steps are required to prepare it for + Take the following steps to prepare a \l{http://beagleboard.org/hardware-xM} + {BeagleBoard-xM} for \B2Q. - \note \b{It is important that the steps in this section are repeated - every time after updating \SDK.} + \note It is important that you repeat the steps in this section after you + update \SDK. - The images containing \B2Q stack for BeagleBoard-xM is included in the SDK, - ready to be copied to a micro-SD card. + The images containing \B2Q stack for BeagleBoard-xM are included in \SDK, + ready to be copied to an SD card. - \section1 Preparing a Micro-SD Card + \section1 Preparing an SD Card - For \B2QA, a micro-SD card of at least 2GB capacity is needed. For \B2QL, - a card of at least 512MB capacity is sufficient. + For \B2QA, an SD card of at least 2 GB capacity is needed. For \B2QL, + a card of at least 512 MB capacity is sufficient. \include detect-sd-card-device-name.qdocinc instructions @@ -421,23 +430,23 @@ The commands used in this step vary depending on whether you are developing for embedded Android or embedded Linux. - Write the image to the micro-SD card: + To write the image to the SD card: \list \li \b{\B2QA} \code cd - sudo dd if=Boot2Qt-1.0/beagleboard-eAndroid/images/sdcard.img of=/dev/XXX bs=1M + sudo dd if=Boot2Qt-1.0/beagleboard-eAndroid/images/sdcard.img of=/dev/ bs=1M \endcode \li \b{\B2QL} \code cd - sudo Boot2Qt-1.0/beagleboard-eLinux/images/deploy.sh /dev/XXX + sudo Boot2Qt-1.0/beagleboard-eLinux/images/deploy.sh /dev/ \endcode \endlist - After the image has been deployed, power up the device and confirm that it shows - a \B2Q welcome screen and/or demo. + After the image has been deployed, power up the device and check that + the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -447,9 +456,8 @@ \include b2qt-post-install-setup.qdocinc configuring device kit - \b {You are now ready to start developing for your device!} - - See \l{Building and Running an Example} + You are now ready to start developing for your device. For more information, + see \l{Building and Running an Example}. */ /*! @@ -458,21 +466,20 @@ \title Preparing Sabre Lite i.MX 6 \previouspage qtee-installation-guide.html - When using a + Take the following steps to prepare a \l{http://boundarydevices.com/products/sabre-lite-imx6-sbc/}{Sabre - Lite i.MX 6} as a development device, following steps are required - to prepare it for \B2Q. + Lite i.MX 6} for \B2Q. - \note \b{It is important that the steps in this section are repeated - every time after updating \SDK.} + \note It is important that you repeat the steps in this section after you + update \SDK. The images containing the \B2Q stack for Sabre Lite i.MX 6 are included - in the SDK, ready to be copied to a micro-SD card. + in \SDK, ready to be copied to an SD card. - \section1 Preparing a Micro-SD Card + \section1 Preparing an SD Card - For \B2QA, a micro-SD card of at least 4GB capacity is needed. For \B2QL, - a card of at least 512MB capacity is sufficient. + For \B2QA, an SD card of at least 4 GB capacity is needed. For \B2QL, + a card of at least 512 MB capacity is sufficient. \include detect-sd-card-device-name.qdocinc instructions @@ -485,11 +492,11 @@ \l{http://boundarydevices.com/android-jellybean-on-i-mx6-with-no-disclaimers/}{Boundary Devices Android Jellybean i.MX6 images} (registration required). - Use the following commands to create a micro-SD card containing the + Use the following commands to create an SD card containing the downloaded image: - \list - \li Extract the downloaded package + \list 1 + \li Extract the downloaded package: \code ~/$ mkdir bd-android ~/$ cd bd-android @@ -497,7 +504,7 @@ \endcode \li Run device/boundary/mksdcard.sh: \code - ~/bd-android$ sudo device/boundary/mksdcard.sh /dev/XXX + ~/bd-android$ sudo device/boundary/mksdcard.sh /dev/ ~/bd-android$ sync \endcode \endlist @@ -510,24 +517,24 @@ sudo apt-get install u-boot-tools \endcode - Then, upgrade the micro-SD Card with \B2Q. Use one of the commands below, - depending on whether you're developing for embedded Android or Linux: + Then, upgrade the SD card with \B2Q. Use one of the commands below, + depending on whether you are developing for embedded Android or Linux: \list \li \b{\B2QA} \code cd - Boot2Qt-1.0/iMX6-eAndroid/images/deploy.sh /dev/XXX + Boot2Qt-1.0/iMX6-eAndroid/images/deploy.sh /dev/ \endcode \li \b{\B2QL} \code cd - Boot2Qt-1.0/iMX6-eLinux/images/deploy.sh /dev/XXX + Boot2Qt-1.0/iMX6-eLinux/images/deploy.sh /dev/ \endcode \endlist - After the installation is complete, power up the device and confirm that it shows - a \B2Q welcome screen and/or demo. + After the installation is complete, power up the device and check that + the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -537,9 +544,8 @@ \include b2qt-post-install-setup.qdocinc configuring device kit - \b {You are now ready to start developing for your device!} - - See \l{Building and Running an Example} + You are now ready to start developing for your device. For more information, + see \l{Building and Running an Example}. */ /*! @@ -549,45 +555,44 @@ \previouspage qtee-installation-guide.html \nextpage qtee-building-and-running.html - When using a \l{http://www.raspberrypi.org/}{Raspberry Pi} as a - development device, following steps are required to prepare it for + Take the following steps to prepare a \l{http://www.raspberrypi.org/} + {Raspberry Pi} for \B2Q. - Note that 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 + \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. - \note \b{It is important that the steps in this section are repeated - every time after updating \SDK.} + \note It is important that you repeat the steps in this section after you + update \SDK. - The images containing \B2Q stack for Raspberry Pi is included in the SDK, - ready to be copied to a micro-SD card. + The image containing \B2Q stack for Raspberry Pi is included in the SDK, + ready to be copied to an SD card. - \section1 Preparing a Micro-SD Card + \section1 Preparing an SD Card - An SD card of at least 512MB capacity is sufficient. + An SD card of at least 512 MB capacity is sufficient. \include detect-sd-card-device-name.qdocinc instructions \section1 Installing the \B2Q Image - Write the image to the micro-SD card: + To write the image to the SD card: \code cd - sudo Boot2Qt-1.0/raspberrypi-eLinux/images/deploy.sh /dev/XXX + sudo Boot2Qt-1.0/raspberrypi-eLinux/images/deploy.sh /dev/ \endcode - After the image has been deployed, power up the device and confirm that it shows - a \B2Q welcome screen and/or demo. + After the image has been deployed, power up the device and check that + the \B2Q welcome screen and/or demo appear. \section1 Configuring a Device Kit in Qt Creator \include b2qt-post-install-setup.qdocinc configuring network device - \b {You are now ready to start developing for your device!} - - See \l{Building and Running an Example} + You are now ready to start developing for your device. For more information, + see \l{Building and Running an Example}. */ /*! diff --git a/src/doc/src/detect-sd-card-device-name.qdocinc b/src/doc/src/detect-sd-card-device-name.qdocinc index e7601c9..40d7f51 100644 --- a/src/doc/src/detect-sd-card-device-name.qdocinc +++ b/src/doc/src/detect-sd-card-device-name.qdocinc @@ -18,28 +18,28 @@ ****************************************************************************/ /*! //! [instructions] - Plug the micro-SD card or reader into the development host PC, + Plug in the SD card or reader to the development host, and use the following command to find out its device name: \code lsblk -d \endcode - Removable devices such as SD cards have a value '1' in + Removable devices such as SD cards have the value '1' in the \e RM column. - \warning \b{Make very sure you select the right device. Selecting - the wrong one can result in a wiped hard drive}. + \warning Make sure to select the correct device, because selecting + the wrong one can result in a wiped hard drive. Typical device names for SD cards include \c {sdb} and \c {mmcblk0}. The full device path is \c {/dev/} followed by - the name. Replace \b XXX with the device name in below - instructions. + the name. - Now make sure the micro-SD card is not mounted: + To make sure that the SD card is not mounted, enter the following + command, where is the device name: \code - umount /dev/XXX + umount /dev/ \endcode //! [instructions] */ -- cgit v1.2.3 From 46a143c9fef70647a1d06ce4fc1b9ef85e796bc9 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 10 Dec 2013 14:11:04 +0100 Subject: Doc: unify punctuation of list items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the period from the end of the first list item for consistency. Change-Id: I8926473a804be175c50ddf2dd0923bcc8e98c37c Reviewed-by: Topi Reiniö --- src/doc/src/b2qt.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index 4169cff..a6515e4 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -67,7 +67,7 @@ \list \li Development environment that is installed on a Linux development - desktop by using an online installer. + desktop by using an online installer \li \B2Q \endlist -- 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 +- src/doc/src/b2qt.qdoc | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'src') 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 diff --git a/src/doc/src/b2qt.qdoc b/src/doc/src/b2qt.qdoc index a6515e4..61635d6 100644 --- a/src/doc/src/b2qt.qdoc +++ b/src/doc/src/b2qt.qdoc @@ -299,12 +299,12 @@ software. You need to do this only once. \list 1 - \li Power down the device. + \li Power off the device. \li Connect the device to the development host with a USB cable. \li To start the Nexus up in \e{fastboot} mode, press the power button for a second, and then keep the \b {Volume Down} key pressed down, until you see a screen with a green robot with its front panel open. - \note If the ordinary startup screen appears instead, power down the + \note If the ordinary startup screen appears instead, power off the device and try again. \li On the development host, enter the following command: \code @@ -364,7 +364,7 @@ To install the drivers to Nexus 7: \list 1 - \li Power up the device and connect it to the development host via USB. + \li Power on the device and connect it to the development host via USB. Also check that the device is \e{not} in fastboot mode. \li Run the driver extractors: \code @@ -386,7 +386,7 @@ \endcode \endlist - After the installation is complete, power up the device and check that + After the installation is complete, power on the device and check that the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -445,7 +445,7 @@ \endcode \endlist - After the image has been deployed, power up the device and check that + After the image has been deployed, power on the device and check that the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -533,7 +533,7 @@ \endcode \endlist - After the installation is complete, power up the device and check that + After the installation is complete, power on the device and check that the \B2Q welcome screen and/or demo appear. \section1 Setting up USB Access @@ -584,7 +584,7 @@ sudo Boot2Qt-1.0/raspberrypi-eLinux/images/deploy.sh /dev/ \endcode - After the image has been deployed, power up the device and check that + After the image has been deployed, power on the device and check that the \B2Q welcome screen and/or demo appear. \section1 Configuring a Device Kit in Qt Creator @@ -606,7 +606,7 @@ application and running it on the device: \list 1 - \li Make sure that your device is powered up and connected to the + \li Make sure that your device is powered on and connected to the development host. \li In Qt Creator, select \b{File > New File or Project} > \b Applications > \b{Qt Quick 2 Application (Built-in Types)} > @@ -859,7 +859,7 @@ \section2 How do I shut down the Nexus 7? If the \B2Q demo launcher is running, start the \b {Launcher - Settings} app, and press the power button to power off the device. + Settings} app, and select \b {Shut Down} to power off the device. Otherwise, make sure the Nexus 7 is connected to the development host, and run the following command in a terminal: @@ -867,6 +867,9 @@ /Tools/b2qt/adb shell reboot -p \endcode + If the device is in the fastboot mode, use the volume button to display the + \b {Power off} option and press the power button to power off the device. + Alternatively, press and hold the power button for 10 seconds. This will force a reboot. -- cgit v1.2.3