diff options
77 files changed, 451 insertions, 310 deletions
diff --git a/src/doc/config/b2qt.qdocconf b/src/doc/config/b2qt.qdocconf index 1e4b5ff..1e499dc 100644 --- a/src/doc/config/b2qt.qdocconf +++ b/src/doc/config/b2qt.qdocconf @@ -6,7 +6,7 @@ sourceencoding = UTF-8 project = QtEnterpriseEmbedded description = Qt Enterprise Embedded Documentation -version = 3.1.1 +version = 3.2.0 sourcedirs = ../src \ ../../imports/wifi \ @@ -24,7 +24,7 @@ indexes = $QT_INSTALL_DOCS/qtquick/qtquick.index \ qhp.projects = B2Qt qhp.B2Qt.file = b2qt.qhp -qhp.B2Qt.namespace = com.digia.b2qt.311 +qhp.B2Qt.namespace = com.digia.b2qt.320 qhp.B2Qt.virtualFolder = b2qt qhp.B2Qt.indexTitle = Qt Enterprise Embedded Documentation qhp.B2Qt.indexRoot = diff --git a/src/doc/config/html-offline.qdocconf b/src/doc/config/html-offline.qdocconf index 0e01c05..997bf42 100644 --- a/src/doc/config/html-offline.qdocconf +++ b/src/doc/config/html-offline.qdocconf @@ -23,5 +23,5 @@ HTML.footer = \ " Digia, Qt and their respective logos are trademarks of Digia Plc \n" \ " in Finland and/or other countries worldwide. All other trademarks are property\n" \ " of their respective owners. <a title=\"Privacy Policy\"\n" \ - " href=\"http://qt.digia.com/Digia-Legal-Notice--Privacy-Policy/\">Privacy Policy</a></p>\n" \ + " href=\"http://www.qt.io/privacy-policy\">Privacy Policy</a></p>\n" \ "</div>\n" diff --git a/src/doc/images/ok.png b/src/doc/images/ok.png Binary files differnew file mode 100644 index 0000000..7c27201 --- /dev/null +++ b/src/doc/images/ok.png diff --git a/src/doc/src/b2qt-external-pages.qdoc b/src/doc/src/b2qt-external-pages.qdoc deleted file mode 100644 index d642fa2..0000000 --- a/src/doc/src/b2qt-external-pages.qdoc +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 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/ -** -****************************************************************************/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise-Embedded/Supported-Modules-and-Known-Issues/ - \title Known Issues -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise-Embedded/ - \title product page -*/ - -/*! - \externalpage https://qtcloudservices.com/products/enginio-data-storage/ - \title Enginio Data Storage -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Advanced-Data-Visualization/ - \title Qt Data Visualization -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Quick-Enterprise-Controls/ - \title Qt Quick Enterprise Controls -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Virtual-Keyboard/ - \title Qt Virtual Keyboard -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Charts/ - \title Qt Charts -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Quick-Compiler/ - \title Qt Quick Compiler -*/ - -/*! - \externalpage https://www.yoctoproject.org/ - \title Yocto Project -*/ diff --git a/src/doc/src/b2qt-post-install-setup.qdocinc b/src/doc/src/b2qt-post-install-setup.qdocinc index 0bd96dd..18ae25a 100644 --- a/src/doc/src/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/b2qt-post-install-setup.qdocinc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/detect-sd-card-device-name.qdocinc b/src/doc/src/detect-sd-card-device-name.qdocinc index b74947d..dbc1a64 100644 --- a/src/doc/src/detect-sd-card-device-name.qdocinc +++ b/src/doc/src/detect-sd-card-device-name.qdocinc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc index f321404..f81876c 100644 --- a/src/doc/src/devices/qtee-bd-sl-imx6.qdoc +++ b/src/doc/src/devices/qtee-bd-sl-imx6.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! @@ -42,7 +42,7 @@ \section1 Installing the Android image \e{If installing} \B2QL, \e{you can skip this step and proceed to} - \l{Installing the Boot to Qt Image}. + \l{#Installing the Boot to Qt Image}{Installing the Boot to Qt Image}. Download the package \e{imx6-jb-20130628.tar.gz} from \l{http://boundarydevices.com/android-jellybean-on-i-mx6-with-no-disclaimers/}{Boundary diff --git a/src/doc/src/devices/qtee-beagleboard-xm.qdoc b/src/doc/src/devices/qtee-beagleboard-xm.qdoc index 17da679..cee898c 100644 --- a/src/doc/src/devices/qtee-beagleboard-xm.qdoc +++ b/src/doc/src/devices/qtee-beagleboard-xm.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-beaglebone-black.qdoc b/src/doc/src/devices/qtee-beaglebone-black.qdoc index e7316b1..8bd7e73 100644 --- a/src/doc/src/devices/qtee-beaglebone-black.qdoc +++ b/src/doc/src/devices/qtee-beaglebone-black.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! @@ -41,7 +41,7 @@ \section1 Installing the Android image \e{If installing} \B2QL, \e{you can skip this step and proceed to} - \l{Installing the Boot to Qt Image}. + \l{#Installing the Boot to Qt Image}{Installing the Boot to Qt Image}. Download the package \e{TI_Android_JB_4.2.2_DevKit_4.1.1_beagleboneblack.tar.gz} from \l{http://downloads.ti.com/sitara_android/esd/TI_Android_DevKit/TI_Android_JB_4_2_2_DevKit_4_1_1/index_FDS.html} diff --git a/src/doc/src/devices/qtee-imx53.qdoc b/src/doc/src/devices/qtee-imx53.qdoc index 96dcbea..bf02f08 100644 --- a/src/doc/src/devices/qtee-imx53.qdoc +++ b/src/doc/src/devices/qtee-imx53.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-nexus-7.qdoc b/src/doc/src/devices/qtee-nexus-7.qdoc index 07d636b..c2e7c6a 100644 --- a/src/doc/src/devices/qtee-nexus-7.qdoc +++ b/src/doc/src/devices/qtee-nexus-7.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-raspberry-pi.qdoc b/src/doc/src/devices/qtee-raspberry-pi.qdoc index ff45dff..a4e0a69 100644 --- a/src/doc/src/devices/qtee-raspberry-pi.qdoc +++ b/src/doc/src/devices/qtee-raspberry-pi.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc b/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc index e6cbade..ad845d3 100644 --- a/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc +++ b/src/doc/src/devices/qtee-sabre-sd-imx6quad.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/devices/qtee-supported-devices.qdoc b/src/doc/src/devices/qtee-supported-devices.qdoc index ad33aa9..7bdb875 100644 --- a/src/doc/src/devices/qtee-supported-devices.qdoc +++ b/src/doc/src/devices/qtee-supported-devices.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -82,7 +82,79 @@ {Raspberry Pi Model B} \endlist - \section2 Legacy Reference Devices + \section2 Supported Features on Reference Devices + + The following features are supported without any modification on the + pre-built images available for the reference devices: + + \table + \header \li Feature + \li BD-SL-i.MX6 (Linux) + \li Raspberry Pi B (Linux) + \li BeagleBone Black (Linux) + \li Nexus 7 (2012) (Android) + \li Nexus 7 (2013) (Android) + + \row \li USB Serial + \li \image ok + \li \image ok + \li + \li + \li + + \row \li WiFi + \li + \li \inlineimage ok + \sup 1 + \li + \li \image ok + \li \image ok + + \row \li Touch Display + \li \image ok + \li + \li + \li \image ok + \li \image ok + + \row \li Video Playback + \li \image ok + \li + \li + \li \image ok + \li \image ok + + \row \li HDMI Output + \li + \li \image ok + \li \image ok + \li + \li + + \row \li Kernel Version + \li 3.10.17 + \li 3.10.30 + \li 3.12.17 + \li + \li 3.4.0 + + \row \li Display Resolution + \li + \li \list \li 640x480 \li 1280x720 \li 1600x1200 \endlist + \li \list \li 1280x720 \endlist + \li \list \li 1280x800 \endlist + \li \list \li 1920x1200 \endlist + \endtable + + \b Notes: + + \list 1 + \li A driver for the WiFi adapter must be present in the kernel, and + the adapter must be connected to the Raspberry Pi before booting + up the device. + \endlist + + \section1 Legacy Reference Devices The following devices are no longer tested or supported by the latest release of \SDK. diff --git a/src/doc/src/devices/qtee-toradex-apalis.qdoc b/src/doc/src/devices/qtee-toradex-apalis.qdoc index ad09024..6979253 100644 --- a/src/doc/src/devices/qtee-toradex-apalis.qdoc +++ b/src/doc/src/devices/qtee-toradex-apalis.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/qtee-building-running.qdoc b/src/doc/src/qtee-building-running.qdoc index 7dbcb04..f9c3dd1 100644 --- a/src/doc/src/qtee-building-running.qdoc +++ b/src/doc/src/qtee-building-running.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/qtee-changelog.qdoc b/src/doc/src/qtee-changelog.qdoc index 494c285..3c8ab3c 100644 --- a/src/doc/src/qtee-changelog.qdoc +++ b/src/doc/src/qtee-changelog.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -23,6 +23,47 @@ \previouspage qtee-customization.html \nextpage qtee-troubleshooting.html + \section1 \B2Q 3.2.0 + + \list + \li Release date: Oct 14, 2014 + \endlist + + \section2 Changes + \b {New Features}: + \list + \li \B2Q stack was updated to use Qt 5.3.2 on embedded Android + and Linux. + \li \l {Qt Quick Enterprise Controls} was updated to version 1.2. + \li \l {Qt Quick Compiler} was updated to version 1.1. + \li \l {Qt Virtual Keyboard} was update to version 1.2. + \endlist + + \b {Improvements}: + \list + \li Fonts are now deployed as part of the build process of base images. + \li Deployed missing font to enable Hindi layout for virtual keyboard. + \li Reduced downloaded package sizes by stripping out debug symbols + from Qt host tools. + \li Deployed applications no longer \l{Booting to a Custom Application} + {launch automatically on reboot}, unless explicitly set. + \li Modified \e {Qt demo launcher} to use all available screen space + for flicking between applications. + \li Improved resolution of \e {Qt demo launcher} application preview + images. + \li Added an option in \e {Launcher Settings} to apply a \e {"Retro"} + style for the virtual keyboard. + \li Made the \e {Display FPS} option in \e {Launcher Settings} + persistent. + \li Updated the \e {Qt 5 Everywhere}Â demo. + \endlist + + \b {Fixed Bugs}: + \list + \li Fixed Qt WebEngine demo freezing on embedded Android. + + \endlist + \section1 \B2Q 3.1.1 \list diff --git a/src/doc/src/qtee-custom-embedded-linux.qdoc b/src/doc/src/qtee-custom-embedded-linux.qdoc index 9b8faf1..a33e41a 100644 --- a/src/doc/src/qtee-custom-embedded-linux.qdoc +++ b/src/doc/src/qtee-custom-embedded-linux.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doc/src/qtee-customization.qdoc b/src/doc/src/qtee-customization.qdoc index ec6e7c8..1bd937d 100644 --- a/src/doc/src/qtee-customization.qdoc +++ b/src/doc/src/qtee-customization.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -62,11 +62,29 @@ \section1 Booting to a Custom Application - 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 or disable the \b {Make this application the default one} - step from the \b{Run Settings} for your project in the Qt Creator \b Projects - mode. + By default, the \e {\B2Q demo launcher} is configured to run on startup. + + To have your application launch on boot: + + \list + \li Go to \b Projects > \b {Run Settings}. + \li Under \b Deployment, click on \b {Add Deploy Step}, and select + \b {Make this application the default one}. + \li Re-deploy your project. In \b Edit mode, right-click on the + project and select \b Deploy, or simply click + \inlineimage qtcreator-run.png + (\b{Run}). + \endlist + + Your application will now be launched on the next device reboot. + + Alternatively, you can also use the following command: + \badcode + <INSTALL_DIR>/Tools/b2qt/adb shell appcontroller --make-default <path> + \endcode + + Above, \c{<path>} is the install path of your application binary on the + device. To remove your application from the default startup, use the following command: diff --git a/src/doc/src/qtee-index.qdoc b/src/doc/src/qtee-index.qdoc index c881296..5964b6c 100644 --- a/src/doc/src/qtee-index.qdoc +++ b/src/doc/src/qtee-index.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -125,9 +125,29 @@ hardware configurations. \B2Q support is not limited to the devices used as reference platforms, it can be made to run on a variety of hardware. + \section1 Value-Add Components + + In addition to the \B2Q 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. + \endlist + \section1 About Qt - \l{http://qt.digia.com/}{Qt} is a full development framework with tools + \l{http://www.qt.io}{Qt} is a full development framework with tools designed to streamline the creation of applications and user interfaces for desktop, embedded, and mobile platforms. diff --git a/src/doc/src/qtee-install-guide.qdoc b/src/doc/src/qtee-install-guide.qdoc index e1de18f..6ffc8e6 100644 --- a/src/doc/src/qtee-install-guide.qdoc +++ b/src/doc/src/qtee-install-guide.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -26,8 +26,7 @@ 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 - \l {Known Issues} in \SDK \l {product page}. + In case of problems, see \l{Troubleshooting}. \target Requirements for Development Host \section1 Requirements for Development Host diff --git a/src/doc/src/qtee-licenses.qdoc b/src/doc/src/qtee-licenses.qdoc index 6728712..daf8b82 100644 --- a/src/doc/src/qtee-licenses.qdoc +++ b/src/doc/src/qtee-licenses.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -26,8 +26,8 @@ \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 {product page}{\SDK} on qt.digia.com. + see \l {http://www.qt.io/licensing}. Evaluation licenses are also available, + see \l {product page}{Qt for Device Creation} on www.qt.io. \section1 3rd Party Software Licenses @@ -41,6 +41,10 @@ source licenses and notices are collected into the file \c {/etc/NOTICE.html.gz} in the target images. + \B2QA installs additional 3rd party software on top of standard Android images. The listing + of licensed files and corresponding license information are located in \c {/system/licenses} + directory in the target images. + \section1 Embedded Linux Images The embedded Linux platform is built using tools from the \l {Yocto Project}. diff --git a/src/doc/src/qtee-qml-reference.qdoc b/src/doc/src/qtee-qml-reference.qdoc index c085ad7..7ee86a3 100644 --- a/src/doc/src/qtee-qml-reference.qdoc +++ b/src/doc/src/qtee-qml-reference.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/src/doc/src/qtee-troubleshooting.qdoc b/src/doc/src/qtee-troubleshooting.qdoc index 0e730c6..8d7ad6b 100644 --- a/src/doc/src/qtee-troubleshooting.qdoc +++ b/src/doc/src/qtee-troubleshooting.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ @@ -23,9 +23,6 @@ \previouspage qtee-changelog.html \nextpage qtee-licenses.html - \note An updated version of this information may be available in Digia customer portal, - see \l {Known Issues} in \SDK \l {product page}. - \section1 General Issues \section2 I have problems deploying/launching the application in Qt Creator diff --git a/src/doc/src/shared/b2qt-external-pages.qdoc b/src/doc/src/shared/b2qt-external-pages.qdoc index d642fa2..bdbd9b9 100644 --- a/src/doc/src/shared/b2qt-external-pages.qdoc +++ b/src/doc/src/shared/b2qt-external-pages.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,17 +13,12 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise-Embedded/Supported-Modules-and-Known-Issues/ - \title Known Issues -*/ - -/*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise-Embedded/ + \externalpage http://www.qt.io/qt-for-device-creation/ \title product page */ @@ -33,27 +28,27 @@ */ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Advanced-Data-Visualization/ + \externalpage http://www.qt.io/qt-features \title Qt Data Visualization */ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Quick-Enterprise-Controls/ + \externalpage http://www.qt.io/qt-features \title Qt Quick Enterprise Controls */ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Virtual-Keyboard/ + \externalpage http://www.qt.io/qt-features \title Qt Virtual Keyboard */ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Charts/ + \externalpage http://www.qt.io/qt-features \title Qt Charts */ /*! - \externalpage http://qt.digia.com/Product/Qt-Enterprise/Qt-Quick-Compiler/ + \externalpage http://www.qt.io/qt-features \title Qt Quick Compiler */ diff --git a/src/doc/src/shared/b2qt-post-install-setup.qdocinc b/src/doc/src/shared/b2qt-post-install-setup.qdocinc index 0bd96dd..1624f6a 100644 --- a/src/doc/src/shared/b2qt-post-install-setup.qdocinc +++ b/src/doc/src/shared/b2qt-post-install-setup.qdocinc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! @@ -34,7 +34,7 @@ cable. If the device is already connected, disconnect and reconnect the USB cable after running the command above. - \li On \B2QA, you can confirm that the connection is working by running + \li You can confirm that the connection is working by running the following shell command: \code diff --git a/src/doc/src/shared/detect-sd-card-device-name.qdocinc b/src/doc/src/shared/detect-sd-card-device-name.qdocinc index b74947d..dbc1a64 100644 --- a/src/doc/src/shared/detect-sd-card-device-name.qdocinc +++ b/src/doc/src/shared/detect-sd-card-device-name.qdocinc @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ /*! diff --git a/src/doppelganger/main.cpp b/src/doppelganger/main.cpp index 0fe5338..3e86a66 100644 --- a/src/doppelganger/main.cpp +++ b/src/doppelganger/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <binder/IPCThreadState.h> diff --git a/src/doppelganger/permissioncontroller.cpp b/src/doppelganger/permissioncontroller.cpp index a759dd7..9538b1a 100644 --- a/src/doppelganger/permissioncontroller.cpp +++ b/src/doppelganger/permissioncontroller.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "permissioncontroller.h" diff --git a/src/doppelganger/permissioncontroller.h b/src/doppelganger/permissioncontroller.h index 7feb4b6..211a346 100644 --- a/src/doppelganger/permissioncontroller.h +++ b/src/doppelganger/permissioncontroller.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef PERMISSIONCONTROLLER_H diff --git a/src/doppelganger/powermanager.cpp b/src/doppelganger/powermanager.cpp index 47ab02f..7f0da97 100644 --- a/src/doppelganger/powermanager.cpp +++ b/src/doppelganger/powermanager.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/src/doppelganger/powermanager.h b/src/doppelganger/powermanager.h index f934b31..23f2695 100644 --- a/src/doppelganger/powermanager.h +++ b/src/doppelganger/powermanager.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ diff --git a/src/doppelganger/schedulingpolicyservice.cpp b/src/doppelganger/schedulingpolicyservice.cpp index 365e97a..7113e6a 100644 --- a/src/doppelganger/schedulingpolicyservice.cpp +++ b/src/doppelganger/schedulingpolicyservice.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "schedulingpolicyservice.h" diff --git a/src/doppelganger/schedulingpolicyservice.h b/src/doppelganger/schedulingpolicyservice.h index f544561..2dc1e42 100644 --- a/src/doppelganger/schedulingpolicyservice.h +++ b/src/doppelganger/schedulingpolicyservice.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef SCHEDULINGPOLICYSERVICE_H diff --git a/src/imports/nativemedia/SurfaceTexture.cpp b/src/imports/nativemedia/SurfaceTexture.cpp index 2f4eb57..05207ad 100644 --- a/src/imports/nativemedia/SurfaceTexture.cpp +++ b/src/imports/nativemedia/SurfaceTexture.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #if Q_ANDROID_VERSION_MAJOR > 4 || (Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR >= 1) diff --git a/src/imports/nativemedia/SurfaceTexture.h b/src/imports/nativemedia/SurfaceTexture.h index 9c72362..552d465 100644 --- a/src/imports/nativemedia/SurfaceTexture.h +++ b/src/imports/nativemedia/SurfaceTexture.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #if Q_ANDROID_VERSION_MAJOR > 4 || (Q_ANDROID_VERSION_MAJOR == 4 && Q_ANDROID_VERSION_MINOR >= 1) diff --git a/src/imports/nativemedia/main.cpp b/src/imports/nativemedia/main.cpp index f78c12b..b14b3d0 100644 --- a/src/imports/nativemedia/main.cpp +++ b/src/imports/nativemedia/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <QtGui> diff --git a/src/imports/nativemedia/omx.cpp b/src/imports/nativemedia/omx.cpp index 9c68d57..b2ad4bc 100644 --- a/src/imports/nativemedia/omx.cpp +++ b/src/imports/nativemedia/omx.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <OMXAL/OpenMAXAL.h> diff --git a/src/imports/nativemedia/omxmodule.cpp b/src/imports/nativemedia/omxmodule.cpp index a6e6f4d..2daa154 100644 --- a/src/imports/nativemedia/omxmodule.cpp +++ b/src/imports/nativemedia/omxmodule.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "omxnode.h" diff --git a/src/imports/nativemedia/omxnode.cpp b/src/imports/nativemedia/omxnode.cpp index b7ad101..27ec1da 100644 --- a/src/imports/nativemedia/omxnode.cpp +++ b/src/imports/nativemedia/omxnode.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "omxnode.h" diff --git a/src/imports/nativemedia/omxnode.h b/src/imports/nativemedia/omxnode.h index 433f9ec..e658378 100644 --- a/src/imports/nativemedia/omxnode.h +++ b/src/imports/nativemedia/omxnode.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef OMXNODE_H diff --git a/src/imports/nativemedia/omxplayer.h b/src/imports/nativemedia/omxplayer.h index 9127dfc..05bb224 100644 --- a/src/imports/nativemedia/omxplayer.h +++ b/src/imports/nativemedia/omxplayer.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef OMXPLAYER_H diff --git a/src/imports/nativemedia/test.qml b/src/imports/nativemedia/test.qml index ad6a7f2..01a1bfd 100644 --- a/src/imports/nativemedia/test.qml +++ b/src/imports/nativemedia/test.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ import QtQuick 2.0 diff --git a/src/imports/utils/plugin.cpp b/src/imports/utils/plugin.cpp index 3adf633..4012e96 100644 --- a/src/imports/utils/plugin.cpp +++ b/src/imports/utils/plugin.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <b2qtdevice.h> diff --git a/src/imports/wifi/pluginmain.cpp b/src/imports/wifi/pluginmain.cpp index 51a2e7c..bc72906 100644 --- a/src/imports/wifi/pluginmain.cpp +++ b/src/imports/wifi/pluginmain.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,78 +13,18 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "qwifimanager.h" +#include "qwifiinterface.h" -#include <QtCore/QDir> -#include <QtCore/QDebug> -#include <QtCore/QByteArray> #include <QtQml/QQmlExtensionPlugin> #include <QtQml/qqml.h> -#ifdef Q_OS_ANDROID -#include <hardware_legacy/wifi.h> -#endif -/*! - \qmltype Interface - \inqmlmodule Qt.labs.wifi - \ingroup wifi-qmltypes - \brief The Interface element provides the module API. - - This element cannot be directly created. It can only be accessed via a namespace import. - - \code - import Qt.labs.wifi 0.1 - import Qt.labs.wifi 0.1 as Wifi - - Component.onCompleted: { - if (Wifi.Interface.wifiSupported()) { - var component = Qt.createComponent("WifiMenu.qml") - } else { - print("WiFi functionality not available on this device.") - } - } - \endcode -*/ - -/*! - \qmlmethod bool Interface::wifiSupported() - - Returns true if the device is WiFi capable (provides a WiFi driver), otherwise returns false. -*/ - - -class QWifiGlobal : public QObject -{ - Q_OBJECT -public: - explicit QWifiGlobal(QObject *parent = 0) - : QObject(parent) {} - ~QWifiGlobal() {} - - Q_INVOKABLE bool wifiSupported() const - { - bool hasInterface = QDir().exists(QStringLiteral("/sys/class/net/wlan0")); - if (!hasInterface) - qWarning() << "QWifiGlobal: could not find wifi interface in /sys/class/net/"; -#ifdef Q_OS_ANDROID - if (hasInterface && wifi_load_driver() == 0 && wifi_start_supplicant(0) == 0) { - return true; - } else { - qWarning() << "QWifiGlobal: wifi driver is not available"; - return false; - } -#else - return hasInterface; -#endif - } -}; - static QObject *global_object_wifi(QQmlEngine *, QJSEngine *) { - return new QWifiGlobal; + return new QWifiInterface; } class QWifiPlugin : public QQmlExtensionPlugin @@ -99,7 +39,7 @@ public: qmlRegisterType<QWifiManager>(uri, 0, 1, "WifiManager"); qmlRegisterType<QWifiNetworkListModel>(); - qmlRegisterSingletonType<QWifiGlobal>(uri, 0, 1, "Interface", global_object_wifi); + qmlRegisterSingletonType<QWifiInterface>(uri, 0, 1, "Interface", global_object_wifi); } }; diff --git a/src/imports/wifi/qwifi_elinux.cpp b/src/imports/wifi/qwifi_elinux.cpp index 551d887..32e1aa3 100644 --- a/src/imports/wifi/qwifi_elinux.cpp +++ b/src/imports/wifi/qwifi_elinux.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "qwifi_elinux.h" diff --git a/src/imports/wifi/qwifi_elinux.h b/src/imports/wifi/qwifi_elinux.h index 92a04f8..a89642f 100644 --- a/src/imports/wifi/qwifi_elinux.h +++ b/src/imports/wifi/qwifi_elinux.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef LOCAL_WIFI_H diff --git a/src/imports/wifi/qwifiinterface.cpp b/src/imports/wifi/qwifiinterface.cpp new file mode 100644 index 0000000..acd7716 --- /dev/null +++ b/src/imports/wifi/qwifiinterface.cpp @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use the contact form at +** http://www.qt.io +** +** 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://www.qt.io +** +****************************************************************************/ +#include "qwifiinterface.h" + +/*! + \qmltype Interface + \inqmlmodule Qt.labs.wifi + \ingroup wifi-qmltypes + \brief The Interface element provides the module API. + + This element cannot be directly created. It can only be accessed via a namespace import. + + \code + import Qt.labs.wifi 0.1 + import Qt.labs.wifi 0.1 as Wifi + + Component.onCompleted: { + if (Wifi.Interface.wifiSupported()) { + var component = Qt.createComponent("WifiMenu.qml") + } else { + print("WiFi functionality not available on this device.") + } + } + \endcode +*/ + +/*! + \qmlmethod bool Interface::wifiSupported() + + Returns true if the device is WiFi capable (provides a WiFi driver), otherwise returns false. +*/ + +bool QWifiInterface::wifiSupported() const +{ +#ifdef Q_OS_ANDROID + const char *fwpath = 0; + // reload wifi firmware + fwpath = (char *)wifi_get_fw_path(WIFI_GET_FW_PATH_STA); + if (!fwpath) { + qWarning() << "QWifiInterface: failed to get firmware path"; + return false; + } + if (wifi_change_fw_path((const char *)fwpath)) { + qWarning() << "QWifiInterface: failed to change firmware path"; + return false; + } +#endif + const bool hasInterface = QDir().exists(QStringLiteral("/sys/class/net/wlan0")); + if (!hasInterface) + qWarning() << "QWifiInterface: could not find wifi interface in /sys/class/net/"; +#ifdef Q_OS_ANDROID + if (hasInterface && wifi_load_driver() == 0 && wifi_start_supplicant(0) == 0) { + return true; + } else { + qWarning() << "QWifiInterface: wifi driver is not available"; + return false; + } +#else + return hasInterface; +#endif +} diff --git a/src/imports/wifi/qwifiinterface.h b/src/imports/wifi/qwifiinterface.h new file mode 100644 index 0000000..06abd79 --- /dev/null +++ b/src/imports/wifi/qwifiinterface.h @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use the contact form at +** http://www.qt.io +** +** 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://www.qt.io +** +****************************************************************************/ +#ifndef QWIFIINTERFACE_H +#define QWIFIINTERFACE_H + +#include <QtCore/QDir> +#include <QtCore/QDebug> +#ifdef Q_OS_ANDROID +#include <hardware_legacy/wifi.h> +#include <cutils/properties.h> +#endif + +class QWifiInterface : public QObject +{ + Q_OBJECT +public: + explicit QWifiInterface(QObject *parent = 0) + : QObject(parent) {} + ~QWifiInterface() {} + + Q_INVOKABLE bool wifiSupported() const; +}; + +#endif // QWIFIHELPERS_H diff --git a/src/imports/wifi/qwifimanager.cpp b/src/imports/wifi/qwifimanager.cpp index 8eec3e0..2574cd2 100644 --- a/src/imports/wifi/qwifimanager.cpp +++ b/src/imports/wifi/qwifimanager.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,10 +13,11 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "qwifimanager.h" +#include "qwifiinterface.h" #include <QtCore> #ifdef Q_OS_ANDROID @@ -422,6 +423,10 @@ QWifiManager::QWifiManager() , m_startingUp(true) , m_network(0) { + if (!QWifiInterface().wifiSupported()) + // give a warning about API misuse + qWarning() << "WifiManager may not work as expected on this device. Use the API provided by QtWifi " + "library to verify if device has support for Wi-Fi before creating an instance of WifiManager!"; #ifdef Q_OS_ANDROID char interface[PROPERTY_VALUE_MAX]; property_get(WIFI_INTERFACE, interface, NULL); diff --git a/src/imports/wifi/qwifimanager.h b/src/imports/wifi/qwifimanager.h index 3af123f..7acc360 100644 --- a/src/imports/wifi/qwifimanager.h +++ b/src/imports/wifi/qwifimanager.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef QWIFIMANAGER_H diff --git a/src/imports/wifi/qwifinetwork.cpp b/src/imports/wifi/qwifinetwork.cpp index d4c20ef..84e3b5b 100644 --- a/src/imports/wifi/qwifinetwork.cpp +++ b/src/imports/wifi/qwifinetwork.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "qwifinetwork.h" diff --git a/src/imports/wifi/qwifinetwork.h b/src/imports/wifi/qwifinetwork.h index 5ecc6a3..5a92e17 100644 --- a/src/imports/wifi/qwifinetwork.h +++ b/src/imports/wifi/qwifinetwork.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef QWIFINETWORK_H diff --git a/src/imports/wifi/qwifinetworklistmodel.cpp b/src/imports/wifi/qwifinetworklistmodel.cpp index f95af36..1886413 100644 --- a/src/imports/wifi/qwifinetworklistmodel.cpp +++ b/src/imports/wifi/qwifinetworklistmodel.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "qwifinetworklistmodel.h" diff --git a/src/imports/wifi/qwifinetworklistmodel.h b/src/imports/wifi/qwifinetworklistmodel.h index 91ca231..0cb9846 100644 --- a/src/imports/wifi/qwifinetworklistmodel.h +++ b/src/imports/wifi/qwifinetworklistmodel.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef QWIFINETWORKLISTMODEL_H diff --git a/src/imports/wifi/wifi.pro b/src/imports/wifi/wifi.pro index fcb6cdd..dabf8cb 100644 --- a/src/imports/wifi/wifi.pro +++ b/src/imports/wifi/wifi.pro @@ -7,13 +7,15 @@ IMPORT_VERSION = 0.1 HEADERS += \ qwifimanager.h \ qwifinetwork.h \ - qwifinetworklistmodel.h + qwifinetworklistmodel.h \ + qwifiinterface.h SOURCES += \ pluginmain.cpp \ qwifimanager.cpp \ qwifinetwork.cpp \ - qwifinetworklistmodel.cpp + qwifinetworklistmodel.cpp \ + qwifiinterface.cpp android: { LIBS += -lhardware_legacy -lcutils diff --git a/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp b/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp index dea6bbd..0d4fa62 100644 --- a/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp +++ b/src/plugins/sensors/eandroid/eandroidaccelerometer.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <eandroidaccelerometer.h> diff --git a/src/plugins/sensors/eandroid/eandroidaccelerometer.h b/src/plugins/sensors/eandroid/eandroidaccelerometer.h index fd55a06..0062c2c 100644 --- a/src/plugins/sensors/eandroid/eandroidaccelerometer.h +++ b/src/plugins/sensors/eandroid/eandroidaccelerometer.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDACCELEROMETER_H diff --git a/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp b/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp index fc26f93..10e4bc3 100644 --- a/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidambientlightsensor.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "eandroidambientlightsensor.h" diff --git a/src/plugins/sensors/eandroid/eandroidambientlightsensor.h b/src/plugins/sensors/eandroid/eandroidambientlightsensor.h index 4123363..dba24ea 100644 --- a/src/plugins/sensors/eandroid/eandroidambientlightsensor.h +++ b/src/plugins/sensors/eandroid/eandroidambientlightsensor.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDAMBIENTLIGHTSENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidbasesensor.cpp b/src/plugins/sensors/eandroid/eandroidbasesensor.cpp index 7363234..49ec5e4 100644 --- a/src/plugins/sensors/eandroid/eandroidbasesensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidbasesensor.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <eandroidbasesensor.h> diff --git a/src/plugins/sensors/eandroid/eandroidbasesensor.h b/src/plugins/sensors/eandroid/eandroidbasesensor.h index 40e48a2..16afebf 100644 --- a/src/plugins/sensors/eandroid/eandroidbasesensor.h +++ b/src/plugins/sensors/eandroid/eandroidbasesensor.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDBASESENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidgyroscope.cpp b/src/plugins/sensors/eandroid/eandroidgyroscope.cpp index 8e303c6..783933f 100644 --- a/src/plugins/sensors/eandroid/eandroidgyroscope.cpp +++ b/src/plugins/sensors/eandroid/eandroidgyroscope.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "eandroidgyroscope.h" diff --git a/src/plugins/sensors/eandroid/eandroidgyroscope.h b/src/plugins/sensors/eandroid/eandroidgyroscope.h index 14aa492..96a8005 100644 --- a/src/plugins/sensors/eandroid/eandroidgyroscope.h +++ b/src/plugins/sensors/eandroid/eandroidgyroscope.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDGYROSCOPE_H diff --git a/src/plugins/sensors/eandroid/eandroidlight.cpp b/src/plugins/sensors/eandroid/eandroidlight.cpp index 99a8663..a7e9243 100644 --- a/src/plugins/sensors/eandroid/eandroidlight.cpp +++ b/src/plugins/sensors/eandroid/eandroidlight.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <eandroidlight.h> diff --git a/src/plugins/sensors/eandroid/eandroidlight.h b/src/plugins/sensors/eandroid/eandroidlight.h index d8d3b8b..75ce1ac 100644 --- a/src/plugins/sensors/eandroid/eandroidlight.h +++ b/src/plugins/sensors/eandroid/eandroidlight.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDLIGHT_H diff --git a/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp b/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp index 6fd9100..73597b2 100644 --- a/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp +++ b/src/plugins/sensors/eandroid/eandroidmagnetometer.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "eandroidmagnetometer.h" diff --git a/src/plugins/sensors/eandroid/eandroidmagnetometer.h b/src/plugins/sensors/eandroid/eandroidmagnetometer.h index 5feaa13..92838b5 100644 --- a/src/plugins/sensors/eandroid/eandroidmagnetometer.h +++ b/src/plugins/sensors/eandroid/eandroidmagnetometer.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDMAGNETOMETER_H diff --git a/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp b/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp index 7be52d7..ee0ab7a 100644 --- a/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp +++ b/src/plugins/sensors/eandroid/eandroidrotationsensor.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "eandroidrotationsensor.h" diff --git a/src/plugins/sensors/eandroid/eandroidrotationsensor.h b/src/plugins/sensors/eandroid/eandroidrotationsensor.h index b94d2e5..79ac239 100644 --- a/src/plugins/sensors/eandroid/eandroidrotationsensor.h +++ b/src/plugins/sensors/eandroid/eandroidrotationsensor.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDROTATIONSENSOR_H diff --git a/src/plugins/sensors/eandroid/eandroidsensordevice.cpp b/src/plugins/sensors/eandroid/eandroidsensordevice.cpp index 5570fc6..9b9e03e 100644 --- a/src/plugins/sensors/eandroid/eandroidsensordevice.cpp +++ b/src/plugins/sensors/eandroid/eandroidsensordevice.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <eandroidsensordevice.h> diff --git a/src/plugins/sensors/eandroid/eandroidsensordevice.h b/src/plugins/sensors/eandroid/eandroidsensordevice.h index ed4fbbb..db4e0f4 100644 --- a/src/plugins/sensors/eandroid/eandroidsensordevice.h +++ b/src/plugins/sensors/eandroid/eandroidsensordevice.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef EANDROIDSENSORDEVICE_H diff --git a/src/plugins/sensors/eandroid/main.cpp b/src/plugins/sensors/eandroid/main.cpp index bea3345..8b62a18 100644 --- a/src/plugins/sensors/eandroid/main.cpp +++ b/src/plugins/sensors/eandroid/main.cpp @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** conditions see http://www.qt.io/licensing. For further information +** use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser diff --git a/src/qconnectivity/main.cpp b/src/qconnectivity/main.cpp index 97f9582..f932772 100644 --- a/src/qconnectivity/main.cpp +++ b/src/qconnectivity/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include <QtCore> @@ -163,7 +163,7 @@ QConnectivityDaemon::QConnectivityDaemon() m_linkUp(false), m_leaseTimer(0), m_isEmulator(isEmulator()), - m_attemptCount(12) + m_attemptCount(50) { qDebug() << "starting QConnectivityDaemon..."; if (!m_isEmulator) { @@ -213,9 +213,9 @@ void QConnectivityDaemon::initNetdConnection() connect(m_netdSocket, SIGNAL(error(QLocalSocket::LocalSocketError)), this, SLOT(handleError(QLocalSocket::LocalSocketError))); } else { - qWarning() << "QConnectivityDaemon: failed to connect to netd socket"; + qWarning() << "QConnectivityDaemon: failed to connect to netd socket, reattempting..."; if (--m_attemptCount != 0) - QTimer::singleShot(2000, this, SLOT(initNetdConnection())); + QTimer::singleShot(200, this, SLOT(initNetdConnection())); return; } if (ethernetSupported()) { @@ -224,11 +224,6 @@ void QConnectivityDaemon::initNetdConnection() sendCommand(QByteArray("0 interface setcfg ").append(m_ethInterface).append(" down").constData()); sendCommand(QByteArray("0 interface setcfg ").append(m_ethInterface).append(" up").constData()); } - char wifiInterface[PROPERTY_VALUE_MAX]; - property_get("wifi.interface", wifiInterface, NULL); - if (wifiInterface) - // reload wifi firmware - sendCommand(QByteArray("0 softap fwreload ").append(wifiInterface).append(" STA").constData()); // disable firewall - this setting seems to be enabled only when using "Always-on VPN" // mode on Android phones, see setLockdownTracker() in ConnectivityService.java sendCommand("0 firewall disable"); @@ -271,10 +266,8 @@ void QConnectivityDaemon::sendCommand(const char *command) const void QConnectivityDaemon::handleInterfaceChange(const QList<QByteArray> &message) { // Format: "Code Iface linkstate <name> <up/down>" - if (message.size() < 5) { - qWarning() << "QConnectivityDaemon: broken command"; + if (message.size() < 5) return; - } if (message.at(2) == "linkstate" && message.at(3) == m_ethInterface) { if (message.at(4) == "up") { diff --git a/src/qt_hw_init/main.cpp b/src/qt_hw_init/main.cpp index 7a8b3a1..15cc807 100644 --- a/src/qt_hw_init/main.cpp +++ b/src/qt_hw_init/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "b2qtdevice.h" diff --git a/src/utils/b2qtdevice.cpp b/src/utils/b2qtdevice.cpp index c59859c..d7a7cd2 100644 --- a/src/utils/b2qtdevice.cpp +++ b/src/utils/b2qtdevice.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #include "b2qtdevice.h" @@ -103,6 +103,7 @@ bool B2QtDevice::setDisplayBrightness(quint8 value) emit displayBrightnessChanged(value); return true; #else + Q_UNUSED(value); return false; #endif } diff --git a/src/utils/b2qtdevice.h b/src/utils/b2qtdevice.h index fb3232a..0563e3f 100644 --- a/src/utils/b2qtdevice.h +++ b/src/utils/b2qtdevice.h @@ -3,7 +3,7 @@ ** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use the contact form at -** http://qt.digia.com/ +** http://www.qt.io ** ** This file is part of Qt Enterprise Embedded. ** @@ -13,7 +13,7 @@ ** 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/ +** the contact form at http://www.qt.io ** ****************************************************************************/ #ifndef B2QTDEVICE_H |
