From 61d6538beff04bcff148e491b01d5a06350db8b6 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Wed, 16 Oct 2013 13:57:19 +0200
Subject: Update About Boot to Qt demo

Update the text displayed in the demo to discuss Boot to Qt
for embedded Linux, and fix other minor issues.

Task-number: QTRD-2456
Change-Id: Ic23d6b3ef772a4bfdd0c6fe650cbf0d555b31578
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
---
 basicsuite/About Boot to Qt/AboutBoot2Qt.qml | 22 +++++++++++++++-------
 basicsuite/About Boot to Qt/QtForAndroid.qml | 19 ++++++++++++-------
 2 files changed, 27 insertions(+), 14 deletions(-)

(limited to 'basicsuite')

diff --git a/basicsuite/About Boot to Qt/AboutBoot2Qt.qml b/basicsuite/About Boot to Qt/AboutBoot2Qt.qml
index 66346c1..7d8aa9a 100644
--- a/basicsuite/About Boot to Qt/AboutBoot2Qt.qml	
+++ b/basicsuite/About Boot to Qt/AboutBoot2Qt.qml	
@@ -16,12 +16,20 @@ Column {
     ContentText {
         id: brief
         width: parent.width
-        text: '<p align="justify">Boot to Qt is the working name for a light-weight UI stack for embedded linux,
-               based on the Qt Framework by Digia. Boot to Qt places Qt on top of an Android
-               kernel/baselayer and offers an elegant means of developing beautiful and
-               performant embedded devices.
+        text: '<p align="justify">Boot to Qt is a light-weight UI stack for embedded systems, based on the Qt Framework by Digia,
+               offering an elegant means of developing beautiful and performant embedded devices. It supports two different
+               operating systems:
+               <ul>
+                 <li><b>Boot to Qt for embedded Android</b> places Qt on top of an Android (version 4.1 or higher)
+                 kernel/baselayer.</li>
+                 <li><b>Boot to Qt for embedded Linux</b> places Qt on top of an Linux kernel/baselayer, built using
+                 Yocto 1.4 \'Dylan\' release.</li>
+               </ul>
+               Both versions have been tested and verified on a number of different hardware configurations.
+               Boot to Qt support is not limited to the devices used as reference platforms, it can be made to run on a
+               variety of hardware.
 
-               <p align="justify">Boot to Qt is a commercial-only SDK offering which includes a ready-made stack
+               <p align="justify">Boot to Qt is part of a commercial-only SDK offering which includes a ready-made stack
                with full Qt Creator integration. The SDK allows building and running on device
                with just a button. Embedded development has never been this easy!'
     }
@@ -33,7 +41,7 @@ Column {
         anchors.horizontalCenter: parent.horizontalCenter
         Box { text: "Application"; accentColor: "coral" }
         Box { text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-        Box { text: "Android Baselayer"; accentColor: "steelblue" }
+        Box { text: "Android/Linux Baselayer"; accentColor: "steelblue" }
         Box { text: "Embedded Hardware"; accentColor: "steelblue"}
     }
 
@@ -42,7 +50,7 @@ Column {
 
         width: parent.width
 
-        text: '<p align="justify">Boot to Qt runs on top of Android 4.0 based kernels and has been tested and verified on
+        text: '<p align="justify">Boot to Qt has been tested and verified on
                a number of different hardware configurations, including:
                <ul>
                  <li>Google Nexus 7 - NVIDIA Tegra3 Quad Core, 1 GB RAM</li>
diff --git a/basicsuite/About Boot to Qt/QtForAndroid.qml b/basicsuite/About Boot to Qt/QtForAndroid.qml
index 2eac080..565cd7d 100644
--- a/basicsuite/About Boot to Qt/QtForAndroid.qml	
+++ b/basicsuite/About Boot to Qt/QtForAndroid.qml	
@@ -8,7 +8,7 @@ Column {
     spacing: engine.smallFontSize()
 
     Title {
-        text: "Boot2Qt vs Qt for Android"
+        text: "Boot to Qt vs Qt for Android"
     }
 
     ContentText {
@@ -19,12 +19,11 @@ Column {
                can run on Android devices. For developers writing applications
                for the Android ecosystem, Qt for Android is the right choice.
 
-               <p align="justify">Boot2Qt tries to strip down the Android stack to the bare minimum,
-               relying only on basic Linux features. The majority of the Android stack,
-               such as <i>SurfaceFlinger</i> or <i>DalvikVM</i> is not running in
-               Boot2Qt, resulting in faster startup times, lower memory consumption
-               and overall better performance.
-               '
+               <p align="justify"><b>Boot to Qt for embedded Android</b> tries to strip down
+               the Android stack to the bare minimum, relying only on basic Linux features.
+               The majority of the Android stack, such as <i>Dalvik virtual machine</i> is
+               not running in Boot to Qt, resulting in faster startup times, lower memory consumption
+               and overall better performance.'
     }
 
     Column {
@@ -45,4 +44,10 @@ Column {
         Box { text: "Embedded Hardware"; accentColor: "steelblue"}
     }
 
+    ContentText {
+        width: parent.width
+        text: '<p align="justify"><b>Boot to Qt for embedded Linux</b> 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.'
+    }
 }
-- 
cgit v1.2.3