From a46ceb8270695754304158e9f6b3de8c5043b2d9 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Mon, 9 Feb 2015 10:20:19 +0100 Subject: b2qt-flashing-wizard: Disable next page when no platforms found Change-Id: I30d0eb65dc45e388484af65b09305d12d3d02ab6 Task-number: QTEE-906 Reviewed-by: Samuli Piippo --- src/b2qt-flashing-wizard/platform_page.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp index 609a5aa..a70178d 100644 --- a/src/b2qt-flashing-wizard/platform_page.cpp +++ b/src/b2qt-flashing-wizard/platform_page.cpp @@ -66,6 +66,8 @@ PlatformPage::~PlatformPage() bool PlatformPage::isComplete() const { + if (mButtons.isEmpty() || buttonData().name.isEmpty()) + return false; return true; } -- cgit v1.2.3 From c4cc08cd557f875fda44a25495f812d0278af541 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 17 Feb 2015 10:16:46 +0100 Subject: Doc: ChangeLog for 4.1.0 release Change-Id: I761b601567b87adefac8487a92591d3c5e9709ef Reviewed-by: Kalle Viironen --- src/doc/src/qtee-changelog.qdoc | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src') diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc index 06ea18d..9378f1a 100644 --- a/src/doc/src/qtee-changelog.qdoc +++ b/src/doc/src/qtee-changelog.qdoc @@ -23,6 +23,35 @@ \previouspage qtee-customization.html \nextpage qtee-troubleshooting.html + \section1 \B2Q 4.1.0 + \list + \li Release date: Feb 19, 2015 + \endlist + + \section2 Changes + \b{New Features}: + \list + \li \B2Q stack was updated to use Qt 5.4.1 on embedded Android + and Linux. + \endlist + + \b {Improvements}: + + \list + \li Enabled \e adb daemon listening to both USB and network connections + simultaneously in embedded Linux + \li Enabled D-Bus session bus on boot + \li Implemented better support for compiling projects using embedded + Linux toolchains without Qt Creator + \li Documentation improvements + \endlist + + \b {Fixed Bugs}: + \list + \li \e {Build Your Own Stack}: Fixed add-on modules built into the image + not being included in the generated Qt Creator custom Kit + \endlist + \section1 \B2Q 4.0.0 \list \li Release date: Dec 10, 2014 -- cgit v1.2.3 From af0cafa14d4f0f0a932edc68d7ebb9ac1888f502 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 5 Feb 2015 11:50:13 +0100 Subject: Doc: Move 'Value-Add Components' list to the overview page This is a better location for it, improving visibility. Change-Id: Ie6c47fd0679fa53406eec87ce84d12bd54b67782 Reviewed-by: Kalle Viironen --- src/doc/src/qtee-index.qdoc | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index 872b25e..4ab3594 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -79,7 +79,7 @@ \title Overview - The development package that you get with Qt for device creation consists of: + The development package that you get with \SDK consists of: \include common.qdocinc overview-list @@ -100,6 +100,28 @@ For overview about Qt libraries see the \l {Qt reference documentation}. + \section1 Additional Embedded Libraries and Value-Add Components + + In addition to the Boot to Qt stack and a comprehensive development + environment, \SDK comes with a set of components that bring new features and + speed up the creation of high-performing, modern UI embedded applications: + + \list + \li \l {Qt Virtual Keyboard} - complete virtual keyboard solution with + word-prediction and multiple languages supported. + \li \l {Qt Quick Enterprise Controls} - a set of advanced UI controls + with an industry-specific look-and-feel. + \li \l {Qt Quick Compiler} - enables compiling .qml source files into + application binaries, improving load times and security for code + assets. + \li \l {Qt Charts} - UI Components for displaying visually pleasing + charts, driven by static or dynamic data models. + \li \l {Qt Data Visualization} - UI Components for creating stunning 3D + data visualizations. + \li \l {Qt Quick 2D Renderer} - enables Qt Quick UIs on GPU-less + devices. + \endlist + \section1 About the Development Environment The development environment is built around the Qt Creator IDE. Qt Creator @@ -179,28 +201,6 @@ \l {Supported Platforms}{reference platforms}, it can be made to run on a variety of hardware. - \section1 Additional Embedded Libraries and Value-Add Components - - In addition to the Boot to Qt stack and a comprehensive development - environment, \SDK comes with a set of components that bring new features and - speed up the creation of high-performing, modern UI embedded applications: - - \list - \li \l {Qt Virtual Keyboard} - complete virtual keyboard solution with - word-prediction and multiple languages supported. - \li \l {Qt Quick Enterprise Controls} - a set of advanced UI controls - with an industry-specific look-and-feel. - \li \l {Qt Quick Compiler} - enables compiling .qml source files into - application binaries, improving load times and security for code - assets. - \li \l {Qt Charts} - UI Components for displaying visually pleasing - charts, driven by static or dynamic data models. - \li \l {Qt Data Visualization} - UI Components for creating stunning 3D - data visualizations. - \li \l {Qt Quick 2D Renderer} - enables Qt Quick UIs on GPU-less - devices. - \endlist - \section1 Build-Your-Own-Stack Tooling \B2QL is built using the tools and resources from the \l {Yocto Project}, -- cgit v1.2.3 From 9c0a7afb30060ceae11e660610b9b67728ac9eab Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 30 Dec 2014 13:35:46 +0100 Subject: Doc: Add table of contents in the sidebar This sidebar is used in the doc.qt.io online style. Having a TOC visible on all pages improves usability considerably. Also, add one page previously missing from the TOC (About Boot to Qt). Change-Id: Ic21a8ae9309971a590a3a23d278cfe67b45f05d1 Reviewed-by: Kalle Viironen --- src/doc/config/b2qt.qdocconf | 2 ++ src/doc/config/style/qt5-sidebar.html | 28 ++++++++++++++++++++++++++++ src/doc/src/qtee-index.qdoc | 1 + 3 files changed, 31 insertions(+) create mode 100644 src/doc/config/style/qt5-sidebar.html (limited to 'src') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 69f248b..0f7f734 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -49,3 +49,5 @@ navigation.landingpage = "Qt 5.4 for Device Creation" navigation.qmltypespage = "Add-On Modules" Cpp.ignoreDirectives += Q_DECLARE_LOGGING_CATEGORY + +HTML.stylesheets += style/qt5-sidebar.html diff --git a/src/doc/config/style/qt5-sidebar.html b/src/doc/config/style/qt5-sidebar.html new file mode 100644 index 0000000..5f0660c --- /dev/null +++ b/src/doc/config/style/qt5-sidebar.html @@ -0,0 +1,28 @@ +
+
+

Qt for Device Creation

+
+ +
+
+
+

Reference

+
+ +
diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index 4ab3594..b9f35b3 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -39,6 +39,7 @@ \list \li \l{Overview} + \li \l{About Boot to Qt} \li \l{Installation Guide} \li \l{Supported Platforms} \li \l{Preparing Hardware} -- cgit v1.2.3 From 1e28429511ac4f722b215c5f14d6d0175aa97c56 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 29 Jan 2015 11:36:08 +0100 Subject: Doc: Updated copyright license holder in documentation footer Also updated 'Privacy Policy' URL. Change-Id: I65d8a49ef35397445b7bf27b245799a20f7fcf54 Reviewed-by: Kalle Viironen --- src/doc/config/html-offline.qdocconf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 997bf42..142ec46 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -12,16 +12,15 @@ HTML.footer = \ " \n" \ "
\n" \ "

\n" \ - " © 2014 Digia Plc and/or its\n" \ - " subsidiaries.

\n" \ + " © 2015 The Qt Company.

\n" \ "

\n" \ " Licensees holding valid Qt Commercial licenses may use this document in\n" \ " accordance with the Qt Commercial License Agreement provided with the\n" \ " Software or, alternatively, in accordance with the terms contained in a\n" \ - " written agreement between you and Digia.<\p>\n" \ + " written agreement between you and The Qt Company.<\p>\n" \ "

\n" \ - " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ + " Qt and respective logos are trademarks of The Qt Company \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. Privacy Policy

\n" \ + " href=\"http://www.qt.io/terms-conditions/#section-3\">Privacy Policy

\n" \ "
\n" -- cgit v1.2.3 From f02112c5feaa816b98d66c198e0635f3039c5c6c Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 29 Jan 2015 11:51:15 +0100 Subject: Doc: Move Toradex Colibri VF61 to Supported Device Group 1 Task-number: QTEE-893 Change-Id: I4ffdfdb3b9c72f3e36bd0670faa28b0dac13e18a Reviewed-by: Kalle Viironen --- src/doc/src/devices/qtee-supported-devices.qdoc | 35 ++++++++++++------------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index 45eb804..a41a8bd 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -108,6 +108,12 @@ \li \image ok \li \image ok \header \li Devices Without GPU \li \li + \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module} + {Toradex Colibri VF61}\br + Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br + solution with 1 MB on-chip SRAM + \li \image ok + \li \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF5xx-computer-module} {Toradex Colibri VF50}\br Single-core (ARM Cortex-A5) solution with 1.5 MB on-chip SRAM @@ -162,13 +168,6 @@ @250MHz GPU, 512 MB (shared with GPU) RAM \li \image ok \li - \header \li Devices Without GPU \li \li - \row \li \l{https://www.toradex.com/products/colibri-arm-computer-modules/freescale-vybrid-VF6xx-computer-module} - {Toradex Colibri VF61}\br - Dual-core (ARM Cortex-A5 + ARM Cortex-M4)\br - solution with 1 MB on-chip SRAM - \li \image ok - \li \endtable \section2 Group 3 @@ -269,6 +268,17 @@ \li \image ok \li \image ok \li + \row \li Toradex Colibri VF61 + \li \image ok + \li \image ok + \li \image ok + \li + \li + \li \image ok + \li \image ok + \li \image ok + \li + \li \image ok \row \li Toradex Colibri VF50 \li \image ok \li \image ok @@ -336,17 +346,6 @@ \li \image ok \li \image ok \li - \row \li Toradex Colibri VF61 - \li \image ok - \li \image ok - \li \image ok - \li - \li - \li \image ok - \li \image ok - \li \image ok - \li - \li \image ok \endtable \section1 Supported Development Environment -- cgit v1.2.3 From 5e20808693989708b4b78956f3f66bc4e13b18a6 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 30 Dec 2014 13:14:11 +0100 Subject: Doc: Rename instances of 'Digia' to 'The Qt Company' Task-number: QTEE-880 Change-Id: Ib58fe60950ad2b2f4f1e81f6ead473101b55dffd Reviewed-by: Kalle Viironen --- src/doc/src/qtee-custom-embedded-linux.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index fe781b3..25ae673 100644 --- a/src/doc/src/qtee-custom-embedded-linux.qdoc +++ b/src/doc/src/qtee-custom-embedded-linux.qdoc @@ -30,11 +30,11 @@ \section2 Note About Support Services for Yocto Tools - By default, Digia will only provide customer support for the Yocto + By default, The Qt Company will only provide customer support for the Yocto recipes on the reference platforms, as delivered with \SDK, and setting up the development environment for them. Receiving support for any other configuration requires a separate service agreement - between a customer and Digia. + between a customer and The Qt Company. \section1 Requirements -- cgit v1.2.3 From 64f107a16590023e433b27db3ab57e968d9b7f0d Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 17 Feb 2015 11:00:41 +0100 Subject: Doc: Update the list of required packages for BYOS And split the command to several lines using '\' to avoid scrollbars in online documentation Task-number: QTEE-884 Change-Id: Icfaaacd4f65b140d763ac9a1d47af250064601e9 Reviewed-by: Samuli Piippo --- src/doc/src/qtee-custom-embedded-linux.qdoc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index 25ae673..2da45cf 100644 --- a/src/doc/src/qtee-custom-embedded-linux.qdoc +++ b/src/doc/src/qtee-custom-embedded-linux.qdoc @@ -51,10 +51,13 @@ \e {Package Manager}. The \e {Yocto meta layer} package contains the additional recipes required to make the image compatible with \B2Q. - \li Install the dependencies for the Yocto tools and build - scripts. In Ubuntu, the following packages are required: + \li Install the dependencies for the Yocto tools, build + scripts, and the Qt modules. In Ubuntu, the following + packages are required: \badcode - sudo apt-get install gawk wget git-core diffstat unzip p7zip texinfo gcc-multilib build-essential chrpath libsdl1.2-dev xterm + sudo apt-get install gawk wget git-core diffstat unzip p7zip-full texinfo \ + gcc-multilib build-essential chrpath libsdl1.2-dev xterm gperf bison curl \ + udisks screen \endcode \endlist -- cgit v1.2.3 From 7540bc45612a6a95a888ae26314acdb8ad7f8b93 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 17 Feb 2015 10:18:01 +0100 Subject: Doc: Bump version to 4.1.0 Change-Id: I3bc823aabf6af1726952f2be68626e056f0b2ce6 Reviewed-by: Samuli Piippo --- src/doc/config/b2qt.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 0f7f734..59e74d1 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtForDeviceCreation description = Qt 5.4 for Device Creation -version = 4.0.0 +version = 4.1.0 sourcedirs = ../src \ ../../imports/wifi \ @@ -30,7 +30,7 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.400 +qhp.B2Qt.namespace = com.digia.b2qt.410 qhp.B2Qt.virtualFolder = b2qt qhp.B2Qt.indexTitle = Qt 5.4 for Device Creation qhp.B2Qt.indexRoot = -- cgit v1.2.3 From 298830d67316dc5cac9f2b851ec6c6c8e3af36d5 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 8 Jan 2015 10:25:56 +0100 Subject: Doc: Fix issues in Wifi module documentation - Make QWifiDevice reference appear - Fix warnings: - Document constructor/destructor for QWifiConfiguration - Remove signal documentation unused by qdoc - Fix undocumented parameters, \reimp tag Task-number: QTEE-882 Change-Id: Id53feac755bc9d898fee9cbcbfb52e46b6ae17bb Reviewed-by: Gatis Paeglis --- src/doc/config/b2qt.qdocconf | 2 +- src/wifi/qwificonfiguration.cpp | 6 +++++ src/wifi/qwifidevice.cpp | 6 ++--- src/wifi/qwifimanager.cpp | 52 +++++------------------------------------ 4 files changed, 16 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 59e74d1..b57af1e 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -48,6 +48,6 @@ macro.B2QL = "\\e {Boot to Qt for embedded Linux}" navigation.landingpage = "Qt 5.4 for Device Creation" navigation.qmltypespage = "Add-On Modules" -Cpp.ignoreDirectives += Q_DECLARE_LOGGING_CATEGORY +Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY HTML.stylesheets += style/qt5-sidebar.html diff --git a/src/wifi/qwificonfiguration.cpp b/src/wifi/qwificonfiguration.cpp index 87ef440..42196a2 100644 --- a/src/wifi/qwificonfiguration.cpp +++ b/src/wifi/qwificonfiguration.cpp @@ -51,12 +51,18 @@ QWifiConfigurationPrivate::QWifiConfigurationPrivate(QWifiConfiguration *config) establishing a connection. */ +/*! + Constructs a configuration object with parent \a parent. +*/ QWifiConfiguration::QWifiConfiguration(QObject *parent) : QObject(parent) , d_ptr(new QWifiConfigurationPrivate(this)) { } +/*! + Destroys the configuration object. +*/ QWifiConfiguration::~QWifiConfiguration() { delete d_ptr; diff --git a/src/wifi/qwifidevice.cpp b/src/wifi/qwifidevice.cpp index f3eb62b..0e421b7 100644 --- a/src/wifi/qwifidevice.cpp +++ b/src/wifi/qwifidevice.cpp @@ -57,8 +57,8 @@ QWifiDevice::~QWifiDevice() } /*! - Returns \a true if a device is Wifi capable - Wifi driver and firmware has been - successfully loaded by the system, otherwise returns \a false. + Returns \c true if a device is Wifi capable - Wifi driver and firmware has been + successfully loaded by the system, otherwise returns \c false. */ bool QWifiDevice::wifiSupported() { @@ -117,7 +117,7 @@ QByteArray QWifiDevice::wifiInterfaceName() } /*! - A conveniece method to set the Wifi interface name. + A conveniece method to set the Wifi interface \a name. \sa wifiInterfaceName() */ diff --git a/src/wifi/qwifimanager.cpp b/src/wifi/qwifimanager.cpp index db188bf..e971fd1 100644 --- a/src/wifi/qwifimanager.cpp +++ b/src/wifi/qwifimanager.cpp @@ -205,7 +205,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error) QWifiManager packs the scan results in a list-based data model, which can be used with Qt's Model/View classes. Information about a Wifi network can be accessed using the QWifiManager::Roles data roles. - */ +*/ /*! \enum QWifiManager::NetworkState @@ -218,7 +218,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error) \value ObtainingIPAddress Requesting IP address from DHCP server \value DhcpRequestFailed Could not retrieve IP address \value Connected Ready to process network requests - */ +*/ /*! \enum QWifiManager::BackendState @@ -229,7 +229,7 @@ void QWifiManagerPrivate::updateLastError(const QString &error) \value Running Supplicant is initialized and ready to process commands \value Terminating Shutting down wireless supplicant \value NotRunning Wireless supplicant process is not running - */ +*/ /*! \enum QWifiManager::Roles @@ -243,51 +243,10 @@ void QWifiManagerPrivate::updateLastError(const QString &error) \value WPA2Supported holds whether network access point supports WPA2 security protocol (QString) \value WEPSupported holds whether network access point supports WEP security protocol (QString) \value WPSSupported holds whether network access point supports WPS security protocol (QString) - */ - -/*! - \fn QWifiManager::networkStateChanged(NetworkState networkState) - - This signal is emitted whenever the network state changes. The network name - for which the signal is emitted, can be obtained from currentSSID. - - \sa NetworkState, currentSSID() - */ - -/*! - \fn QWifiManager::backendStateChanged(BackendState backendState) - - This signal is emitted whenever the backend state changes. - - \sa start(), stop() - */ - -/*! - \fn QWifiManager::currentSSIDChanged(string currentSSID) - - This signal is emitted when switching between different Wifi networks. - - \sa start(), stop() - */ - -/*! - \fn QWifiManager::scanningChanged(bool scanning) - - This signal is emitted when device starts or stops to scan for available Wifi networks. - - \sa isScanning() - */ - -/*! - \fn QWifiManager::lastErrorChanged(const string error) - - This signal is emitted if some internal process has failed, \a error contains - a message on what has failed. - - \sa connect() - */ +*/ QWifiManager* QWifiManager::m_instance = 0; + /*! Returns a singleton instance of QWifiManager. */ @@ -458,6 +417,7 @@ QString QWifiManager::lastError() const return d->m_lastError; } +/*! \reimp */ bool QWifiManager::event(QEvent *event) { Q_D(QWifiManager); -- cgit v1.2.3 From 0aa0e22afad9dcc1773778a88e3411abaf2a26cf Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 18 Feb 2015 11:52:21 +0100 Subject: Doc: Update minimal hardware requirements Mention Qt Quick 2D Renderer as OpenGL ES 2.0 is no longer a hard requirement. Task-number: QTEE-917 Change-Id: Ia6b2ecfc5b27f44001a76078c6e2a1aa6f91739e Reviewed-by: Gatis Paeglis --- src/doc/src/devices/qtee-supported-devices.qdoc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index a41a8bd..07501b7 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -61,9 +61,12 @@ \list \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 OpenGL ES 2.0 support * \endlist + * On GPU-less hardware, \l {Qt Quick 2D Renderer} can replace the + OpenGL ES 2.0 requirement (with some limitations on graphics capabilities). + \B2QA requires hardware that has support for the Android operating system, version 4.2 or later. For rapid prototyping or feasibility testing, it is possible to install it on most programmable Android devices using @@ -229,7 +232,7 @@ \li HDMI \li HW Accelerated \br Video Playback \li Virtual Keyboard - \li Qt WiFi Module + \li B2Qt WiFi Module \li B2Qt Utils Module \li OpenGL ES 2.0 \li Qt Quick \br 2D Renderer -- cgit v1.2.3 From 8d960279e3398375f2b9cea242289be562332b9a Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 20 Feb 2015 09:47:58 +0100 Subject: Doc: ChangeLog: Update 4.1.0 release date Change-Id: If4993288c0d1f32171dc9307af4ad9cefa3ce813 Reviewed-by: Samuli Piippo --- src/doc/src/qtee-changelog.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc index 9378f1a..dc2cb2a 100644 --- a/src/doc/src/qtee-changelog.qdoc +++ b/src/doc/src/qtee-changelog.qdoc @@ -25,7 +25,7 @@ \section1 \B2Q 4.1.0 \list - \li Release date: Feb 19, 2015 + \li Release date: Feb 24, 2015 \endlist \section2 Changes -- cgit v1.2.3 From da66ed8ce7421506ddeb4e7feea13987c26620c7 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 15 Apr 2015 10:08:27 +0200 Subject: b2qt-flashing-wizard: Hints for users to find error messages more easily If the image creation fails the details widget is opened and scrolled to bottom automatically. Also the progressbar is disabled to indicate a stop. Change-Id: I74573a2b19d915ac90a12645e3e806a979f74baf Reviewed-by: Rainer Keller --- src/b2qt-flashing-wizard/progress_page.cpp | 43 +++++++++++++++++++++--------- src/b2qt-flashing-wizard/progress_page.h | 4 +++ 2 files changed, 35 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/b2qt-flashing-wizard/progress_page.cpp b/src/b2qt-flashing-wizard/progress_page.cpp index 567d986..d518b44 100644 --- a/src/b2qt-flashing-wizard/progress_page.cpp +++ b/src/b2qt-flashing-wizard/progress_page.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -37,13 +38,14 @@ ProgressPage::ProgressPage(QWidget *parent) , mTextEdit(new QTextEdit(this)) , mToggleDetailsButton(new QPushButton(this)) , mCopyToClipboardButton(new QPushButton(this)) + , mProgressBar(0) { setTitle(tr("Disk Creation")); setSubTitle(tr("Writing the hardware platform image to the disk")); setLayout(new QVBoxLayout(this)); - QProgressBar *progressBar = new QProgressBar(this); - progressBar->setRange(0, 0); - layout()->addWidget(progressBar); + mProgressBar = new QProgressBar(this); + mProgressBar->setRange(0, 0); + layout()->addWidget(mProgressBar); mProgress->setWordWrap(true); mProgress->setText(tr("Preparing the disk device...")); layout()->addWidget(mProgress); @@ -91,6 +93,14 @@ void ProgressPage::failed(const QString &message) { mFinished = false; emit completeChanged(); + showDetails(); + mProgressBar->setEnabled(false); + mProgressBar->setRange(0, 100); + mProgressBar->setValue(100); + mProgressBar->setFormat(""); + + // Scroll to bottom + mTextEdit->verticalScrollBar()->setValue(mTextEdit->verticalScrollBar()->maximum()); mProgress->setText(message); } @@ -110,17 +120,26 @@ void ProgressPage::addDetails(QByteArray newData) mTextEdit->append(QString::fromLocal8Bit(newData)); } +void ProgressPage::showDetails() +{ + mTextEdit->show(); + mCopyToClipboardButton->show(); + mToggleDetailsButton->setText(tr("Hide details")); +} + +void ProgressPage::hideDetails() +{ + mTextEdit->hide(); + mCopyToClipboardButton->hide(); + mToggleDetailsButton->setText(tr("Show details")); +} + void ProgressPage::toggleDetails() { - if (mTextEdit->isHidden()) { - mTextEdit->show(); - mCopyToClipboardButton->show(); - mToggleDetailsButton->setText(tr("Hide details")); - } else { - mTextEdit->hide(); - mCopyToClipboardButton->hide(); - mToggleDetailsButton->setText(tr("Show details")); - } + if (mTextEdit->isHidden()) + showDetails(); + else + hideDetails(); } void ProgressPage::copyDetailsToClipboard() diff --git a/src/b2qt-flashing-wizard/progress_page.h b/src/b2qt-flashing-wizard/progress_page.h index f99f11b..c2e4c4c 100644 --- a/src/b2qt-flashing-wizard/progress_page.h +++ b/src/b2qt-flashing-wizard/progress_page.h @@ -25,6 +25,7 @@ class QLabel; class Actor; class QTextEdit; class QPushButton; +class QProgressBar; class ProgressPage : public QWizardPage { @@ -41,6 +42,8 @@ public slots: void finished(); void failed(const QString &step); void addDetails(QByteArray newData); + void showDetails(); + void hideDetails(); void toggleDetails(); void copyDetailsToClipboard(); @@ -51,6 +54,7 @@ private: QTextEdit *mTextEdit; QPushButton *mToggleDetailsButton; QPushButton *mCopyToClipboardButton; + QProgressBar *mProgressBar; }; #endif // PROGRESS_PAGE_H -- cgit v1.2.3 From 1f4b424073ed89263ca69b782617b70207cbd7e2 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 15 Apr 2015 10:28:24 +0200 Subject: b2qt-flashing-wizard: Script standard error in red color Change-Id: I40893222a5ea999eca3f73b05e39e7e1ab53a9a1 Reviewed-by: Alessandro Portale --- src/b2qt-flashing-wizard/actor.h | 1 + src/b2qt-flashing-wizard/progress_page.cpp | 23 +++++++++++++++++++++-- src/b2qt-flashing-wizard/progress_page.h | 1 + src/b2qt-flashing-wizard/scriptwriter.cpp | 12 +++++++++--- src/b2qt-flashing-wizard/scriptwriter.h | 3 ++- 5 files changed, 34 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/b2qt-flashing-wizard/actor.h b/src/b2qt-flashing-wizard/actor.h index 51e856d..9af55fe 100644 --- a/src/b2qt-flashing-wizard/actor.h +++ b/src/b2qt-flashing-wizard/actor.h @@ -37,6 +37,7 @@ signals: void finished(); void failed(const QString &message); void details(const QByteArray &); + void errorDetails(const QByteArray &); }; #endif // ACTOR_H diff --git a/src/b2qt-flashing-wizard/progress_page.cpp b/src/b2qt-flashing-wizard/progress_page.cpp index d518b44..e9203b3 100644 --- a/src/b2qt-flashing-wizard/progress_page.cpp +++ b/src/b2qt-flashing-wizard/progress_page.cpp @@ -111,13 +111,32 @@ void ProgressPage::setActor(Actor *actor) connect(actor, &Actor::finished, this, &ProgressPage::finished); connect(actor, &Actor::failed, this, &ProgressPage::failed); connect(actor, &Actor::details, this, &ProgressPage::addDetails); + connect(actor, &Actor::errorDetails, this, &ProgressPage::addErrorDetails); connect(actor, &Actor::progress, this, &ProgressPage::progress); } +static void commonDetailReplacements(QByteArray &data) +{ + data.replace(0x08 /* backspace */, ' '); +} + void ProgressPage::addDetails(QByteArray newData) { - newData.replace(0x08 /* backspace */, ' '); - mTextEdit->append(QString::fromLocal8Bit(newData)); + commonDetailReplacements(newData); + mTextEdit->insertPlainText(QString::fromLocal8Bit(newData)); +} + +void ProgressPage::addErrorDetails(QByteArray newData) +{ + if (newData.startsWith('+')) { + addDetails(newData); + return; + } + commonDetailReplacements(newData); + QColor c = mTextEdit->textColor(); + mTextEdit->setTextColor(Qt::red); + mTextEdit->insertPlainText(QString::fromLocal8Bit(newData)); + mTextEdit->setTextColor(c); } void ProgressPage::showDetails() diff --git a/src/b2qt-flashing-wizard/progress_page.h b/src/b2qt-flashing-wizard/progress_page.h index c2e4c4c..393619d 100644 --- a/src/b2qt-flashing-wizard/progress_page.h +++ b/src/b2qt-flashing-wizard/progress_page.h @@ -42,6 +42,7 @@ public slots: void finished(); void failed(const QString &step); void addDetails(QByteArray newData); + void addErrorDetails(QByteArray newData); void showDetails(); void hideDetails(); void toggleDetails(); diff --git a/src/b2qt-flashing-wizard/scriptwriter.cpp b/src/b2qt-flashing-wizard/scriptwriter.cpp index 594aecc..4e38bdd 100644 --- a/src/b2qt-flashing-wizard/scriptwriter.cpp +++ b/src/b2qt-flashing-wizard/scriptwriter.cpp @@ -34,7 +34,6 @@ ScriptWriter::ScriptWriter(QObject *parent) , mDebug(false) , mRoot(false) { - mProcess.setProcessChannelMode(QProcess::MergedChannels); mDebug = qEnvironmentVariableIsSet("DEBUG"); } @@ -81,7 +80,8 @@ bool ScriptWriter::ready(QString &error) const void ScriptWriter::start() { - connect(&mProcess, &QProcess::readyReadStandardOutput, this, &ScriptWriter::readOutput); + connect(&mProcess, &QProcess::readyReadStandardOutput, this, &ScriptWriter::readStandardOutput); + connect(&mProcess, &QProcess::readyReadStandardError, this, &ScriptWriter::readStandardError); connect(&mProcess, (void (QProcess::*)(QProcess::ProcessError))&QProcess::error, this, &ScriptWriter::processError); connect(&mProcess, (void (QProcess::*)(int, QProcess::ExitStatus))&QProcess::finished, this, &ScriptWriter::processFinished); @@ -99,7 +99,7 @@ void ScriptWriter::start() qFatal("Failed to start script"); } -void ScriptWriter::readOutput() +void ScriptWriter::readStandardOutput() { QByteArray ba = mProcess.readAllStandardOutput(); QList baList = ba.split('\n'); @@ -112,6 +112,12 @@ void ScriptWriter::readOutput() emit details(ba); } +void ScriptWriter::readStandardError() +{ + QByteArray ba = mProcess.readAllStandardError(); + emit errorDetails(ba); +} + void ScriptWriter::processFinished(int exitCode, QProcess::ExitStatus exitStatus) { if (exitStatus != QProcess::NormalExit || exitCode != 0) { diff --git a/src/b2qt-flashing-wizard/scriptwriter.h b/src/b2qt-flashing-wizard/scriptwriter.h index 68a7684..a984577 100644 --- a/src/b2qt-flashing-wizard/scriptwriter.h +++ b/src/b2qt-flashing-wizard/scriptwriter.h @@ -39,7 +39,8 @@ public: void setRootFlag(bool); private slots: - void readOutput(); + void readStandardOutput(); + void readStandardError(); void processFinished(int, QProcess::ExitStatus); void processError(QProcess::ProcessError); -- cgit v1.2.3 From 31c8985d9f1f48d177a68514890da2dce581e658 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 22 Apr 2015 13:43:50 +0200 Subject: b2qt-flashing-wizard: Files are now located at a different location Change-Id: I13ad2ed897a8d03159830aa94ea36680e12bd0f9 Reviewed-by: Samuli Piippo --- src/b2qt-flashing-wizard/platform_page.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp index a70178d..28df88b 100644 --- a/src/b2qt-flashing-wizard/platform_page.cpp +++ b/src/b2qt-flashing-wizard/platform_page.cpp @@ -127,10 +127,16 @@ void PlatformPage::initializePage() QDir dir(G_SDKDIR); foreach (const QString i, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { - if (!i.startsWith("Boot2Qt-")) - continue; - QDir dir2(dir.absoluteFilePath(i)); + + if (i.startsWith("Boot2Qt-")) { + // nothing + } else if (dir2.exists("Boot2Qt")) { + dir2 = dir2.absoluteFilePath("Boot2Qt"); + } else { + continue; + } + foreach (const QString j, dir2.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { if (j.startsWith("emulator-")) continue; -- cgit v1.2.3 From c85b1e25191f5a8f6ba0f40921082efb8700da88 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 22 Apr 2015 13:43:20 +0200 Subject: b2qt-flashing-wizard: Remove unused variables Change-Id: I259d8b393361b08468d29b00f6d26e95cac4269e Reviewed-by: Samuli Piippo --- src/b2qt-flashing-wizard/platform_page.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src') diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp index 28df88b..ea51966 100644 --- a/src/b2qt-flashing-wizard/platform_page.cpp +++ b/src/b2qt-flashing-wizard/platform_page.cpp @@ -140,9 +140,6 @@ void PlatformPage::initializePage() foreach (const QString j, dir2.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { if (j.startsWith("emulator-")) continue; - QStringList token = j.split('-'); - QString os = token.takeLast(); - QString name = token.join("-"); loadDeployConfig(dir2.absoluteFilePath(j) + "/images/deploy.conf", i); } -- cgit v1.2.3 From 287a9894ce65b6150fc54d6d151322c8b66e2cba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 May 2015 12:37:38 +0300 Subject: doc: Update colibri vf instructions New set of uboot commands to boot with latest kernel. Colibris have raw SLC NAND memory instead of eMMC. Change-Id: Id621fdb9692baffff14d78a18d9effe34928877e Reviewed-by: Eirik Aavitsland --- src/doc/src/devices/qtee-toradex-colibri-vf.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc index 5c01753..c41728e 100644 --- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc +++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc @@ -56,14 +56,14 @@ sudo Boot2Qt-4.x/colibri-vf-eLinux/images/deploy.sh /dev/ \endcode - By default, the Toradex Colibri-VF devices boot from their internal eMMC. In order to boot from + By default, the Toradex Colibri VF devices boot from their internal NAND memory. In order to boot from an external SD card, the U-Boot needs to be modified. Connect a serial cable to the device and enter into the U-Boot environment by pressing any key before the autoboot. Enter following commands into U-Boot: \badcode set bootcmd 'run sdboot; run ubiboot; run nfsboot;' - set sdboot 'run setup; setenv bootargs ${defargs} ${mmcargs} ${mtdparts} ${setupargs} ${vidargs}; echo Booting from MMC/SD card...; mmc part 0; fatload mmc 0:1 ${loadaddr} zImage && bootz' + set sddtbload 'setenv dtbparam; load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && setenv dtbparam ${fdt_addr_r}' save \endcode -- cgit v1.2.3 From cc30c5ebdef4d845bd18e39c07a5643af0f6c6a2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 May 2015 13:41:40 +0300 Subject: doc: simpler uboot command for colibri vf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2124a91d6fd5f86dce7c5d3f341e505a8016dee0 Reviewed-by: Topi Reiniö Reviewed-by: Eirik Aavitsland --- src/doc/src/devices/qtee-toradex-colibri-vf.qdoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc index c41728e..5753256 100644 --- a/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc +++ b/src/doc/src/devices/qtee-toradex-colibri-vf.qdoc @@ -62,9 +62,8 @@ Enter following commands into U-Boot: \badcode - set bootcmd 'run sdboot; run ubiboot; run nfsboot;' - set sddtbload 'setenv dtbparam; load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && setenv dtbparam ${fdt_addr_r}' - save + run setupdate + run update_uboot \endcode Reset or power cycle the device to continue. -- cgit v1.2.3 From 74f60fe0ef7933dfdcf3a48eb253c6ea8d078605 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 29 May 2015 13:11:02 +0200 Subject: Doc: ChangeLog for release 4.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib58ee343af5f0b749dae73d8662c6b166c090ce4 Reviewed-by: Topi Reiniö --- src/doc/src/qtee-changelog.qdoc | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src') diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc index dc2cb2a..bdaf04a 100644 --- a/src/doc/src/qtee-changelog.qdoc +++ b/src/doc/src/qtee-changelog.qdoc @@ -23,6 +23,29 @@ \previouspage qtee-customization.html \nextpage qtee-troubleshooting.html + \section1 Boot to Qt 4.2.0 + \list + \li Release date: Jun 02, 2015 + \endlist + + \section2 Changes + + \b{New Features}: + \list + \li \B2Q stack was updated to use Qt 5.4.2 on embedded Android + and Linux. + \li \l {Qt Virtual Keyboard} was updated to version 1.3.0. + \li Enabled Chinese (Pinyin), Korean (Hangul) and Japanese (OpenWnn) + input methods for Qt Virtual Keyboard. + \endlist + + \b {Improvements}: + \list + \li Boot to Qt Flashing Wizard: Improved error messages for flashing failures. + \li Toradex Colibri VF and Apalis iMX6 images updated to use the latest + release (v2.3). + \endlist + \section1 \B2Q 4.1.0 \list \li Release date: Feb 24, 2015 -- cgit v1.2.3 From fc10269ca529489dd38a99320dee6046c441074c Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 29 May 2015 13:06:36 +0200 Subject: Doc: Bump version to 4.2.0 Change-Id: If10427f8c5a597dd2fe1e144ad902d8a0cdf7934 Reviewed-by: Samuli Piippo --- src/doc/config/b2qt.qdocconf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index b57af1e..ee7a367 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtForDeviceCreation description = Qt 5.4 for Device Creation -version = 4.1.0 +version = 4.2.0 sourcedirs = ../src \ ../../imports/wifi \ @@ -30,7 +30,7 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.410 +qhp.B2Qt.namespace = com.digia.b2qt.420 qhp.B2Qt.virtualFolder = b2qt qhp.B2Qt.indexTitle = Qt 5.4 for Device Creation qhp.B2Qt.indexRoot = -- cgit v1.2.3