summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-06-25 09:40:41 +0200
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-06-25 10:56:40 +0300
commitba41436c910ccee88e13ceee1546a28f2a94cafc (patch)
tree31568716a6d82c769de0557f29571b0c7170c4e0
parente041027fcac85f677e7006caf1c0b503f7750c01 (diff)
Remove Android stuff and unused content from the About B2Qt app
Task-number: QTEE-955 Change-Id: I4d8838c5a959c6f0b0f75c32e5040ae8f5ce0e8c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-rw-r--r--basicsuite/about-b2qt/AboutBoot2Qt.qml20
-rw-r--r--basicsuite/about-b2qt/QtForAndroid.qml93
-rw-r--r--basicsuite/about-b2qt/QtFramework.qml75
3 files changed, 10 insertions, 178 deletions
diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml
index 5dc7fd7..7033bb7 100644
--- a/basicsuite/about-b2qt/AboutBoot2Qt.qml
+++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml
@@ -65,11 +65,11 @@ Column {
width: parent.width
text: '<p align="justify">Qt for Device Creation 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. It
- supports your key requirements for high performance and minimal footprint, and together
- with Qt - a full framework with modular architecture - delivers unparalleled
- scalability. The development cycle is as rapid as it gets with fully integrated
- embedded tooling, pre-configured software stack and a collection of value-add components.</p>'
+ with a tailored user experience for embedded Linux. It supports your key requirements
+ for high performance and minimal footprint, and together with Qt - a full framework
+ with modular architecture - delivers unparalleled scalability. The development cycle
+ is as rapid as it gets with fully integrated embedded tooling, pre-configured software
+ stack and a collection of value-add components.</p>'
}
// Large overview picture
@@ -160,10 +160,10 @@ Column {
text: '<p align="justify">The <strong>Boot to Qt</strong> software stack gets you
immediately started with software development on your embedded device
- with a tailored user experience for embedded Linux and embedded Android. It
- supports your key requirements for high performance, minimal footprint together
- with Qt’s flexible full-framework modular architecture to deliver unparalleled
- scalability.</p><p align="justify">The Boot to Qt stack can be made to run on a variety
+ with a tailored user experience for embedded Linux. It supports your key requirements
+ for high performance, minimal footprint together with Qt’s flexible full-framework
+ modular architecture to deliver unparalleled scalability.</p>
+ <p align="justify">The Boot to Qt stack can be made to run on a variety
of hardware with the provided <strong>Build-Your-Own-Stack</strong> tooling. It comes
pre-built for several reference devices with the installation of Qt for Device Creation.</p>'
}
@@ -173,7 +173,7 @@ Column {
width: ( parent.width - parent.spacing ) / 2
Box { text: "Application"; accentColor: qtpurple }
Box { text: "Qt Framework"; accentColor: qtlightgreen }
- Box { text: "Android/Linux Baselayer"; accentColor: qtdarkblue }
+ Box { text: "Linux Baselayer"; accentColor: qtdarkblue }
Box { text: "Embedded Hardware"; accentColor: qtdarkblue }
}
diff --git a/basicsuite/about-b2qt/QtForAndroid.qml b/basicsuite/about-b2qt/QtForAndroid.qml
deleted file mode 100644
index fdb45ef..0000000
--- a/basicsuite/about-b2qt/QtForAndroid.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://www.qt.io
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Column {
- id: root
-
- width: parent.width
-
- spacing: engine.smallFontSize()
-
- Title {
- text: "Boot to Qt vs Qt for Android"
- }
-
- ContentText {
- width: parent.width
- text: '<p align="justify">Qt for Android is a port of the Qt Framework to be used
- for application development on the Android platform. Its
- purpose is to enable development of applications that
- can run on Android devices. For developers writing applications
- for the Android ecosystem, Qt for Android is the right choice.
-
- <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 {
- id: diagram
- spacing: 1
- width: parent.width * 0.66
- anchors.horizontalCenter: parent.horizontalCenter
- Box { text: "Application"; accentColor: "coral" }
- Box { text: "Qt for Android"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
- Row {
- width: parent.width
- height: b.height
- Box { id: b; width: parent.width / 2; text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
- Box { width: parent.width / 2; text: "Android (Dalvik)"; accentColor: "steelblue" }
- }
-
- Box { text: "Android Baselayer"; accentColor: "steelblue" }
- 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 tools to contain only components required in the embedded device,
- resulting in smaller image sizes while keeping valuable development tools available.'
- }
-}
diff --git a/basicsuite/about-b2qt/QtFramework.qml b/basicsuite/about-b2qt/QtFramework.qml
deleted file mode 100644
index e5cbe28..0000000
--- a/basicsuite/about-b2qt/QtFramework.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://www.qt.io
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-** * Redistributions of source code must retain the above copyright
-** notice, this list of conditions and the following disclaimer.
-** * Redistributions in binary form must reproduce the above copyright
-** notice, this list of conditions and the following disclaimer in
-** the documentation and/or other materials provided with the
-** distribution.
-** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-** of its contributors may be used to endorse or promote products derived
-** from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Column {
- id: root
-
- width: parent.width
-
- spacing: engine.smallFontSize()
-
- Title {
- text: "Qt Framework"
- }
-
- ContentText {
- id: brief
- width: parent.width
- text: '<p align="justify">Qt is a full development framework with tools designed to streamline
- the creation of applications and user interfaces for desktop, embedded
- and mobile platforms.
- <ul>
- <li><b>Qt Framework</b> - intuitive APIs for C++ and CSS/JavaScript-like
- programming with Qt Quick for rapid UI creation</li><br>
- <li><b>Qt Creator IDE</b> - powerful cross-platform integrated
- development environment, including UI designer tools and on-device debugging</li><br>
- <li><b>Tools and toolchains</b> - internationalization support, embedded toolchains
- and more.</li>
- </ul>
- <p align="justify">With Qt, you can reuse code efficiently to target multiple platforms
- with one code base. The modular C++ class library and developer tools
- easily enables developers to create applications for one platform and
- easily build and run to deploy on another platform.'
- }
-
-
-}