diff options
Diffstat (limited to 'basicsuite')
242 files changed, 684 insertions, 415 deletions
diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml index b97ac3b..d050a71 100644 --- a/basicsuite/about-b2qt/AboutBoot2Qt.qml +++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** @@ -50,28 +50,18 @@ Column { Title { id: title - text: "Boot to Qt" + text: "Qt Enterprise Embedded" } ContentText { id: brief width: parent.width - text: '<p align="justify">Boot to Qt is a light-weight UI stack for embedded systems, based on the Qt Framework by Digia, - offering an elegant means of developing beautiful and performant embedded devices. It supports two different - operating systems: - <ul> - <li><b>Boot to Qt for embedded Android</b> places Qt on top of an Android (version 4.1 or higher) - kernel/baselayer.</li> - <li><b>Boot to Qt for embedded Linux</b> places Qt on top of an Linux kernel/baselayer, built using - Yocto 1.4 \'Dylan\' release.</li> - </ul> - Both versions have been tested and verified on a number of different hardware configurations. - Boot to Qt support is not limited to the devices used as reference platforms, it can be made to run on a - variety of hardware. - - <p align="justify">Boot to Qt is part of a commercial-only SDK offering which includes a ready-made stack - with full Qt Creator integration. The SDK allows building and running on device - with just a button. Embedded development has never been this easy!' + text: '<p align="justify">Qt Enterprise Embedded provides a fully-integrated solution + to get you started immediately with software development on your embedded device + with a tailored user experience for embedded Linux and embedded Android. It + supports your key requirements for high performance, minimal footprint together + with Qt’s flexible full-framework modular architecture to deliver unparalleled + scalability.' } Column { @@ -90,20 +80,41 @@ Column { width: parent.width - text: '<p align="justify">Boot to Qt has been tested and verified on - a number of different hardware configurations, including: + text: '<p align="justify">Qt Enterprise Embedded gives you shorter time-to-market + providing you with the productivity-enhancing tools and value-adding components. + You are up-to-speed with development and prototyping since day one. You can just + focus on writing your application with Qt.<br> + <p align="justify">Qt Enterprise Embedded provides you with the following: <ul> - <li>Google Nexus 7 - NVIDIA Tegra3 Quad Core, 1 GB RAM</li> - <li>Beagle Board xM - ARM Coretex A8 1GHz, 512 MB RAM, PowerVR SGX 530</li> - <li>Freescale i.MX 6 - ARM Cortex A9 1.2GHz, 1 GB RAM, Vivante GC2000</li> - </ul> - Rough minimal requirements for running Boot to Qt are: - <ul> - <li>256Mb of RAM</li> - <li>500Mhz CPU, 1Ghz preferred for 60 FPS velvet UIs</li> - <li>OpenGL ES 2.0 support</li> - <li>Android 4.0+ compatible hardware</li> + <li><b>A full-blown, productivity enhancing development environment</b>, + installed on a Linux development desktop. This self-contained environment + is installed and updated through one online installer and features the Qt + Creator Enterprise IDE, with features that facilitate the whole product + creation lifecycle: UI designer, code editor, direct device deployment + via USB or IP, emulator, on-device debugging and profiling.</li><br> + <li><b>Shorter time-to-market with the Boot to Qt Software Stack</b>. A + light-weight, Qt-optimized, full software stack that is installed into + the actual target device. The stack comes in two flavors, Embedded Android + and Embedded Linux. The pre-built stack gets you up-to-speed with prototyping + in no time and with our professional tooling you can customize the stack into + your exact production needs.</li><br> + <li><b>Full power and scalability of Qt on Embedded</b>. Leverage the + cross-platform C++ native APIs for maximum performance on both beautiful + user interfaces as well as non-GUI operations. With C++, you have full control + over your application code. You can also configure Qt Enterprise Embedded + directly from the source codes into a large variety of supported hardware and + operating systems. As with any Qt project, the same application can be deployed + natively to desktop and mobile OS targets as well.</li><br> + <li><b>Value-Adding Components</b>. No need to re-implement the wheel! Full Qt + Enterprise libraries give you a shortcut on development time providing ready-made + solutions, such as a comprehensive virtual keyboard, charts and industrial UI + controls. </ul> + + <p align="justify">Qt Enterprise Embedded includes <b>Boot to Qt</b>, a light-weight, + Qt-optimized, full software stack for embedded systems that is installed into the actual + target device. The Boot to Qt stack can be made to run on a variety of hardware - Qt + Enterprise Embedded comes with pre-built images for several reference devices. ' } } diff --git a/basicsuite/about-b2qt/Box.qml b/basicsuite/about-b2qt/Box.qml index 283ed9f..ab6e971 100644 --- a/basicsuite/about-b2qt/Box.qml +++ b/basicsuite/about-b2qt/Box.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/about-b2qt/ContentText.qml b/basicsuite/about-b2qt/ContentText.qml index 55d3e36..ec4b791 100644 --- a/basicsuite/about-b2qt/ContentText.qml +++ b/basicsuite/about-b2qt/ContentText.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/about-b2qt/QtForAndroid.qml b/basicsuite/about-b2qt/QtForAndroid.qml index 9c1aa38..16d834a 100644 --- a/basicsuite/about-b2qt/QtForAndroid.qml +++ b/basicsuite/about-b2qt/QtForAndroid.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** @@ -87,7 +87,7 @@ Column { ContentText { width: parent.width text: '<p align="justify"><b>Boot to Qt for embedded Linux</b> is build from scratch using - Yocto 1.4 tools to contain only components required in the embedded device, + Yocto 1.5 tools to contain only components required in the embedded device, resulting in smaller image sizes while keeping valuable development tools available.' } } diff --git a/basicsuite/about-b2qt/QtFramework.qml b/basicsuite/about-b2qt/QtFramework.qml index 7085469..76c2865 100644 --- a/basicsuite/about-b2qt/QtFramework.qml +++ b/basicsuite/about-b2qt/QtFramework.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** @@ -59,9 +59,9 @@ Column { and mobile platforms. <ul> <li><b>Qt Framework</b> - intuitive APIs for C++ and CSS/JavaScript-like - programming with Qt Quick for rapid UI creation<\li> + programming with Qt Quick for rapid UI creation</li><br> <li><b>Qt Creator IDE</b> - powerful cross-platform integrated - development environment, including UI designer tools and on-device debugging</li> + development environment, including UI designer tools and on-device debugging</li><br> <li><b>Tools and toolchains</b> - internationalization support, embedded toolchains and more.</li> </ul> diff --git a/basicsuite/about-b2qt/Title.qml b/basicsuite/about-b2qt/Title.qml index 62d0ba7..0f7f792 100644 --- a/basicsuite/about-b2qt/Title.qml +++ b/basicsuite/about-b2qt/Title.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/about-b2qt/main.qml b/basicsuite/about-b2qt/main.qml index ba726d5..5c5c6df 100644 --- a/basicsuite/about-b2qt/main.qml +++ b/basicsuite/about-b2qt/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** @@ -106,8 +106,8 @@ Item { Item { width: 1; height: engine.smallFontSize() } AboutBoot2Qt { } - QtFramework { } QtForAndroid { } + QtFramework { } Image { id: codeLessImage source: "codeless.png" diff --git a/basicsuite/about-b2qt/title.txt b/basicsuite/about-b2qt/title.txt index 9b133f7..634a26a 100644 --- a/basicsuite/about-b2qt/title.txt +++ b/basicsuite/about-b2qt/title.txt @@ -1 +1 @@ -About Boot to Qt +About Qt Enterprise Embedded diff --git a/basicsuite/camera/CameraControlButton.qml b/basicsuite/camera/CameraControlButton.qml index a740be7..f0dc438 100644 --- a/basicsuite/camera/CameraControlButton.qml +++ b/basicsuite/camera/CameraControlButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/CameraSetting.qml b/basicsuite/camera/CameraSetting.qml index 0912c38..bf8fb6b 100644 --- a/basicsuite/camera/CameraSetting.qml +++ b/basicsuite/camera/CameraSetting.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/CaptureControl.qml b/basicsuite/camera/CaptureControl.qml index 7d09151..5a14e4e 100644 --- a/basicsuite/camera/CaptureControl.qml +++ b/basicsuite/camera/CaptureControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/CapturePreview.qml b/basicsuite/camera/CapturePreview.qml index 64c5f79..db01ca4 100644 --- a/basicsuite/camera/CapturePreview.qml +++ b/basicsuite/camera/CapturePreview.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/Controls.qml b/basicsuite/camera/Controls.qml index bd0db07..cc1e1ad 100644 --- a/basicsuite/camera/Controls.qml +++ b/basicsuite/camera/Controls.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/FocusControl.qml b/basicsuite/camera/FocusControl.qml index 5245cfe..83fd2fe 100644 --- a/basicsuite/camera/FocusControl.qml +++ b/basicsuite/camera/FocusControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/Picker.qml b/basicsuite/camera/Picker.qml index 9cbf27f..e29d70f 100644 --- a/basicsuite/camera/Picker.qml +++ b/basicsuite/camera/Picker.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/RecordingTime.qml b/basicsuite/camera/RecordingTime.qml index 2156b74..941f76a 100644 --- a/basicsuite/camera/RecordingTime.qml +++ b/basicsuite/camera/RecordingTime.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/Slider.qml b/basicsuite/camera/Slider.qml index a9d3c10..18853ad 100644 --- a/basicsuite/camera/Slider.qml +++ b/basicsuite/camera/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/ZoomControl.qml b/basicsuite/camera/ZoomControl.qml index 15f2875..0c1cbdd 100644 --- a/basicsuite/camera/ZoomControl.qml +++ b/basicsuite/camera/ZoomControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/camerautils/camerautils.cpp b/basicsuite/camera/camerautils/camerautils.cpp index f6b6672..9e890d5 100644 --- a/basicsuite/camera/camerautils/camerautils.cpp +++ b/basicsuite/camera/camerautils/camerautils.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/camerautils/camerautils.h b/basicsuite/camera/camerautils/camerautils.h index 1f61c7c..67c5b0d 100644 --- a/basicsuite/camera/camerautils/camerautils.h +++ b/basicsuite/camera/camerautils/camerautils.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/camera/camerautils/camerautils.pro b/basicsuite/camera/camerautils/camerautils.pro index 938a0a9..7e5864e 100644 --- a/basicsuite/camera/camerautils/camerautils.pro +++ b/basicsuite/camera/camerautils/camerautils.pro @@ -12,8 +12,9 @@ HEADERS += camerautils.h pluginfiles.files += \ qmldir \ -target.path += $$[QT_INSTALL_QML]/CameraUtils -pluginfiles.path += $$[QT_INSTALL_QML]/CameraUtils +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/CameraUtils +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH INSTALLS += target pluginfiles diff --git a/basicsuite/camera/camerautils/plugin.cpp b/basicsuite/camera/camerautils/plugin.cpp index 2a8c3ea..5e74e71 100644 --- a/basicsuite/camera/camerautils/plugin.cpp +++ b/basicsuite/camera/camerautils/plugin.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/camera/exclude.txt b/basicsuite/camera/exclude.txt index 5716448..b481e58 100644 --- a/basicsuite/camera/exclude.txt +++ b/basicsuite/camera/exclude.txt @@ -1 +1,8 @@ -android-beagleboard:linux-iMX6:linux-raspberrypi: +android-beaglebone +android-iMX6 +android-emulator +linux-beagleboard +linux-beaglebone +linux-iMX6 +linux-raspberrypi +linux-emulator diff --git a/basicsuite/camera/main.qml b/basicsuite/camera/main.qml index b7437de..a0cf449 100644 --- a/basicsuite/camera/main.qml +++ b/basicsuite/camera/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/controls-touch/content/AndroidDelegate.qml b/basicsuite/controls-touch/content/AndroidDelegate.qml index 36a439a..e4870cc 100644 --- a/basicsuite/controls-touch/content/AndroidDelegate.qml +++ b/basicsuite/controls-touch/content/AndroidDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/content/ButtonPage.qml b/basicsuite/controls-touch/content/ButtonPage.qml index f431a52..e315d72 100644 --- a/basicsuite/controls-touch/content/ButtonPage.qml +++ b/basicsuite/controls-touch/content/ButtonPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/content/ProgressBarPage.qml b/basicsuite/controls-touch/content/ProgressBarPage.qml index dc0f552..d370d39 100644 --- a/basicsuite/controls-touch/content/ProgressBarPage.qml +++ b/basicsuite/controls-touch/content/ProgressBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/content/SliderPage.qml b/basicsuite/controls-touch/content/SliderPage.qml index 8eb9190..eb5d70c 100644 --- a/basicsuite/controls-touch/content/SliderPage.qml +++ b/basicsuite/controls-touch/content/SliderPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/content/TabBarPage.qml b/basicsuite/controls-touch/content/TabBarPage.qml index 7651a3c..f13ab78 100644 --- a/basicsuite/controls-touch/content/TabBarPage.qml +++ b/basicsuite/controls-touch/content/TabBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/content/TextInputPage.qml b/basicsuite/controls-touch/content/TextInputPage.qml index 605afef..058ff53 100644 --- a/basicsuite/controls-touch/content/TextInputPage.qml +++ b/basicsuite/controls-touch/content/TextInputPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/controls-touch/controls-touch.pro b/basicsuite/controls-touch/controls-touch.pro index 0a4ad03..9771bef 100644 --- a/basicsuite/controls-touch/controls-touch.pro +++ b/basicsuite/controls-touch/controls-touch.pro @@ -6,9 +6,11 @@ b2qtdemo_deploy_defaults() content.files = \ *.qml \ *.png \ - content + content \ + images + content.path = $$DESTPATH OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content diff --git a/basicsuite/controls-touch/main.qml b/basicsuite/controls-touch/main.qml index e4d2562..929f31e 100644 --- a/basicsuite/controls-touch/main.qml +++ b/basicsuite/controls-touch/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/enterprise-charts/View1.qml b/basicsuite/enterprise-charts/View1.qml index 308cacd..e3850ae 100644 --- a/basicsuite/enterprise-charts/View1.qml +++ b/basicsuite/enterprise-charts/View1.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View10.qml b/basicsuite/enterprise-charts/View10.qml index 2074b70..2a5a297 100644 --- a/basicsuite/enterprise-charts/View10.qml +++ b/basicsuite/enterprise-charts/View10.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View11.qml b/basicsuite/enterprise-charts/View11.qml index 27166fa..2b2d444 100644 --- a/basicsuite/enterprise-charts/View11.qml +++ b/basicsuite/enterprise-charts/View11.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View12.qml b/basicsuite/enterprise-charts/View12.qml index 4bf89aa..2a0dc55 100644 --- a/basicsuite/enterprise-charts/View12.qml +++ b/basicsuite/enterprise-charts/View12.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View13.qml b/basicsuite/enterprise-charts/View13.qml index 1f6aec1..1322e97 100644 --- a/basicsuite/enterprise-charts/View13.qml +++ b/basicsuite/enterprise-charts/View13.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View14.qml b/basicsuite/enterprise-charts/View14.qml index bae0e8a..e6662a1 100644 --- a/basicsuite/enterprise-charts/View14.qml +++ b/basicsuite/enterprise-charts/View14.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View15.qml b/basicsuite/enterprise-charts/View15.qml index 57db474..74d9789 100644 --- a/basicsuite/enterprise-charts/View15.qml +++ b/basicsuite/enterprise-charts/View15.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml index 698bd2d..a7e0ace 100644 --- a/basicsuite/enterprise-charts/View2.qml +++ b/basicsuite/enterprise-charts/View2.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View3.qml b/basicsuite/enterprise-charts/View3.qml index 88974de..d56ceeb 100644 --- a/basicsuite/enterprise-charts/View3.qml +++ b/basicsuite/enterprise-charts/View3.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View4.qml b/basicsuite/enterprise-charts/View4.qml index fc5c539..5ca5906 100644 --- a/basicsuite/enterprise-charts/View4.qml +++ b/basicsuite/enterprise-charts/View4.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View5.qml b/basicsuite/enterprise-charts/View5.qml index 6077816..4b0882c 100644 --- a/basicsuite/enterprise-charts/View5.qml +++ b/basicsuite/enterprise-charts/View5.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View6.qml b/basicsuite/enterprise-charts/View6.qml index 1ce795a..b9db3ac 100644 --- a/basicsuite/enterprise-charts/View6.qml +++ b/basicsuite/enterprise-charts/View6.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View7.qml b/basicsuite/enterprise-charts/View7.qml index 99776b7..998097a 100644 --- a/basicsuite/enterprise-charts/View7.qml +++ b/basicsuite/enterprise-charts/View7.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View8.qml b/basicsuite/enterprise-charts/View8.qml index cad360d..fcb8a72 100644 --- a/basicsuite/enterprise-charts/View8.qml +++ b/basicsuite/enterprise-charts/View8.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/View9.qml b/basicsuite/enterprise-charts/View9.qml index 0f5796d..5ba3d36 100644 --- a/basicsuite/enterprise-charts/View9.qml +++ b/basicsuite/enterprise-charts/View9.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/enterprise-charts.pro b/basicsuite/enterprise-charts/enterprise-charts.pro new file mode 100644 index 0000000..13c41cf --- /dev/null +++ b/basicsuite/enterprise-charts/enterprise-charts.pro @@ -0,0 +1,12 @@ +TARGET = enterprise-charts + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + *.qml +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content
\ No newline at end of file diff --git a/basicsuite/enterprise-charts/loader.qml b/basicsuite/enterprise-charts/loader.qml index 080fce6..f9b7569 100644 --- a/basicsuite/enterprise-charts/loader.qml +++ b/basicsuite/enterprise-charts/loader.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index b3c02e3..10376c8 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml index 109351c..7958fca 100644 --- a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml +++ b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml index 32092d7..0b24351 100644 --- a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml +++ b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/TachometerStyle.qml b/basicsuite/enterprise-dashboard/TachometerStyle.qml index e601dbb..c4649da 100644 --- a/basicsuite/enterprise-dashboard/TachometerStyle.qml +++ b/basicsuite/enterprise-dashboard/TachometerStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/TurnIndicator.qml b/basicsuite/enterprise-dashboard/TurnIndicator.qml index 576b811..9dd7d5f 100644 --- a/basicsuite/enterprise-dashboard/TurnIndicator.qml +++ b/basicsuite/enterprise-dashboard/TurnIndicator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/ValueSource.qml b/basicsuite/enterprise-dashboard/ValueSource.qml index 10f6ee2..6bd1952 100644 --- a/basicsuite/enterprise-dashboard/ValueSource.qml +++ b/basicsuite/enterprise-dashboard/ValueSource.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-dashboard/enterprise-dashboard.pro b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro new file mode 100644 index 0000000..9fb29f2 --- /dev/null +++ b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro @@ -0,0 +1,13 @@ +TARGET = enterprise-dashboard + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + *.qml \ + images +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content
\ No newline at end of file diff --git a/basicsuite/enterprise-dashboard/main.qml b/basicsuite/enterprise-dashboard/main.qml index 5fbbb64..da5f296 100644 --- a/basicsuite/enterprise-dashboard/main.qml +++ b/basicsuite/enterprise-dashboard/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/BlackButtonBackground.qml b/basicsuite/enterprise-gallery/BlackButtonBackground.qml index 084d4e5..008668f 100644 --- a/basicsuite/enterprise-gallery/BlackButtonBackground.qml +++ b/basicsuite/enterprise-gallery/BlackButtonBackground.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/BlackButtonStyle.qml b/basicsuite/enterprise-gallery/BlackButtonStyle.qml index dde237f..73f6373 100644 --- a/basicsuite/enterprise-gallery/BlackButtonStyle.qml +++ b/basicsuite/enterprise-gallery/BlackButtonStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml index 34991f9..fb85f86 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml index 3340bf3..7aec7b6 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml index fbd71d7..7d00c1f 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CircularGaugeView.qml b/basicsuite/enterprise-gallery/CircularGaugeView.qml index f72fc2f..92ee6c5 100644 --- a/basicsuite/enterprise-gallery/CircularGaugeView.qml +++ b/basicsuite/enterprise-gallery/CircularGaugeView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/ControlView.qml b/basicsuite/enterprise-gallery/ControlView.qml index 17f5784..2c6a7cf 100644 --- a/basicsuite/enterprise-gallery/ControlView.qml +++ b/basicsuite/enterprise-gallery/ControlView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/ControlViewToolbar.qml b/basicsuite/enterprise-gallery/ControlViewToolbar.qml index f23b2d2..5aac041 100644 --- a/basicsuite/enterprise-gallery/ControlViewToolbar.qml +++ b/basicsuite/enterprise-gallery/ControlViewToolbar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CustomizerCheckBox.qml b/basicsuite/enterprise-gallery/CustomizerCheckBox.qml index 9426dc6..542e09a 100644 --- a/basicsuite/enterprise-gallery/CustomizerCheckBox.qml +++ b/basicsuite/enterprise-gallery/CustomizerCheckBox.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CustomizerLabel.qml b/basicsuite/enterprise-gallery/CustomizerLabel.qml index c830832..c4cb69c 100644 --- a/basicsuite/enterprise-gallery/CustomizerLabel.qml +++ b/basicsuite/enterprise-gallery/CustomizerLabel.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/CustomizerSlider.qml b/basicsuite/enterprise-gallery/CustomizerSlider.qml index b98c06d..fb09a17 100644 --- a/basicsuite/enterprise-gallery/CustomizerSlider.qml +++ b/basicsuite/enterprise-gallery/CustomizerSlider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml b/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml index c935de2..c8b9fe5 100644 --- a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml +++ b/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/PieMenuControlView.qml b/basicsuite/enterprise-gallery/PieMenuControlView.qml index 91dae94..cba341b 100644 --- a/basicsuite/enterprise-gallery/PieMenuControlView.qml +++ b/basicsuite/enterprise-gallery/PieMenuControlView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml b/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml index fa2a638..354775d 100644 --- a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml +++ b/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml b/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml index 2f43dd1..1ad8480 100644 --- a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml +++ b/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/StylePicker.qml b/basicsuite/enterprise-gallery/StylePicker.qml index 542abaa..48c1298 100644 --- a/basicsuite/enterprise-gallery/StylePicker.qml +++ b/basicsuite/enterprise-gallery/StylePicker.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/enterprise-gallery/enterprise-gallery.pro b/basicsuite/enterprise-gallery/enterprise-gallery.pro new file mode 100644 index 0000000..3601432 --- /dev/null +++ b/basicsuite/enterprise-gallery/enterprise-gallery.pro @@ -0,0 +1,14 @@ +TARGET = enterprise-gallery + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + *.qml \ + fonts \ + images +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content
\ No newline at end of file diff --git a/basicsuite/enterprise-gallery/main.qml b/basicsuite/enterprise-gallery/main.qml index 43ad848..f1f2e17 100644 --- a/basicsuite/enterprise-gallery/main.qml +++ b/basicsuite/enterprise-gallery/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/graphicaleffects/Checkers.qml b/basicsuite/graphicaleffects/Checkers.qml index 9e42b1c..4dc37b1 100644 --- a/basicsuite/graphicaleffects/Checkers.qml +++ b/basicsuite/graphicaleffects/Checkers.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/description.txt b/basicsuite/graphicaleffects/description.txt index e2d3acf..c19b2c4 100644 --- a/basicsuite/graphicaleffects/description.txt +++ b/basicsuite/graphicaleffects/description.txt @@ -1,2 +1,4 @@ -This example shows the Qt Quick 2.0 ShaderEffect type and the QtGraphicalEffect module. Qt Quick 2.0 provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects. However, as UIs typically reuse many of the same effects, the QtGraphicalEffects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks and more. +This example shows the Qt Quick 2.0 ShaderEffect type and the Qt Graphical Effects module. Qt Quick 2.0 provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects. + +However, as UIs typically reuse many of the same effects, the Qt Graphical Effects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity masks and more. diff --git a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml index fb8302d..c4d425b 100644 --- a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml +++ b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_Colorize.qml b/basicsuite/graphicaleffects/effect_Colorize.qml index 4244f21..a6007b2 100644 --- a/basicsuite/graphicaleffects/effect_Colorize.qml +++ b/basicsuite/graphicaleffects/effect_Colorize.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_CustomDissolve.qml b/basicsuite/graphicaleffects/effect_CustomDissolve.qml index 43be640..a7c4522 100644 --- a/basicsuite/graphicaleffects/effect_CustomDissolve.qml +++ b/basicsuite/graphicaleffects/effect_CustomDissolve.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** @@ -147,7 +147,7 @@ Item { varying lowp float vOpacity; // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl - highp float rand(vec2 n) { + highp float rand(highp vec2 n) { return fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453); } diff --git a/basicsuite/graphicaleffects/effect_CustomWave.qml b/basicsuite/graphicaleffects/effect_CustomWave.qml index 5bde628..eff9a45 100644 --- a/basicsuite/graphicaleffects/effect_CustomWave.qml +++ b/basicsuite/graphicaleffects/effect_CustomWave.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_Displacement.qml b/basicsuite/graphicaleffects/effect_Displacement.qml index 3c7b6d0..2ca3b6a 100644 --- a/basicsuite/graphicaleffects/effect_Displacement.qml +++ b/basicsuite/graphicaleffects/effect_Displacement.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_DropShadow.qml b/basicsuite/graphicaleffects/effect_DropShadow.qml index 0dd3c48..342e531 100644 --- a/basicsuite/graphicaleffects/effect_DropShadow.qml +++ b/basicsuite/graphicaleffects/effect_DropShadow.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_GaussianBlur.qml b/basicsuite/graphicaleffects/effect_GaussianBlur.qml index 7acfa3b..33e5317 100644 --- a/basicsuite/graphicaleffects/effect_GaussianBlur.qml +++ b/basicsuite/graphicaleffects/effect_GaussianBlur.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_Glow.qml b/basicsuite/graphicaleffects/effect_Glow.qml index 728f8cc..96d1a4b 100644 --- a/basicsuite/graphicaleffects/effect_Glow.qml +++ b/basicsuite/graphicaleffects/effect_Glow.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_HueSaturation.qml b/basicsuite/graphicaleffects/effect_HueSaturation.qml index e6ba039..e799ae8 100644 --- a/basicsuite/graphicaleffects/effect_HueSaturation.qml +++ b/basicsuite/graphicaleffects/effect_HueSaturation.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_OpacityMask.qml b/basicsuite/graphicaleffects/effect_OpacityMask.qml index 47df139..fcf4df8 100644 --- a/basicsuite/graphicaleffects/effect_OpacityMask.qml +++ b/basicsuite/graphicaleffects/effect_OpacityMask.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/effect_ThresholdMask.qml b/basicsuite/graphicaleffects/effect_ThresholdMask.qml index 18cb07b..b2b87b3 100644 --- a/basicsuite/graphicaleffects/effect_ThresholdMask.qml +++ b/basicsuite/graphicaleffects/effect_ThresholdMask.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml index 66c97ff..0108180 100644 --- a/basicsuite/graphicaleffects/main.qml +++ b/basicsuite/graphicaleffects/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/launchersettings/NetworkList.qml b/basicsuite/launchersettings/NetworkList.qml index 1f26537..b733eb6 100644 --- a/basicsuite/launchersettings/NetworkList.qml +++ b/basicsuite/launchersettings/NetworkList.qml @@ -39,8 +39,12 @@ ** ****************************************************************************/ import QtQuick 2.0 +import QtQuick.Controls 1.0 import Qt.labs.wifi 0.1 +// ### TODO +// - only 1 delagate open at the time + Item { Component { id: listDelegate @@ -50,18 +54,16 @@ Item { property bool connected: wifiManager.connectedSSID == network.ssid property variant networkModel: model property alias ssidText: ssidLabel.text - height: expanded ? 300 : 70 + height: (expanded ? (connected ? 180: 260) : 70) clip: true // ### fixme + color: "#5C5C5C" + border.color: "black" + border.width: 1 Behavior on height { NumberAnimation { duration: 500; easing.type: Easing.InOutCubic } } width: parent.width - gradient: Gradient { - GradientStop { position: 0; color: "white" } - GradientStop { position: 1; color: "lightgray" } - } - Text { id: ssidLabel anchors.top: parent.top @@ -69,6 +71,7 @@ Item { anchors.margins: 10 font.pixelSize: 20 font.bold: true + color: "#E6E6E6" text: network.ssid + (connected ? " (connected)" : ""); } @@ -79,7 +82,7 @@ Item { anchors.margins: 5 anchors.leftMargin: 40 text: network.bssid - color: "gray" + color: "#E6E6E6" font.pixelSize: ssidLabel.font.pixelSize * 0.5 } @@ -91,7 +94,7 @@ Item { + (network.supportsWPA ? "WPA " : "") + (network.supportsWEP ? "WEP " : "") + (network.supportsWPS ? "WPS " : ""); - color: "gray" + color: "#E6E6E6" font.pixelSize: ssidLabel.font.pixelSize * 0.5 font.italic: true } @@ -104,8 +107,8 @@ Item { anchors.margins: 20 anchors.right: parent.right anchors.top: parent.top - color: "lightblue" - border.color: "lightgray" + color: "#BF8888" + border.color: "#212126" } MouseArea { @@ -115,61 +118,32 @@ Item { } } - Rectangle { - id: passwordInputBackground - anchors.fill: passwordInput - anchors.margins: -5 - color: "white" - radius: 5 - border.color: "gray" - } - - TextInput { + TextField { id: passwordInput y: 100 - width: 300 height: 50 - text: "" + width: 300 + placeholderText: "Enter Password" + visible: !connected anchors.horizontalCenter: parent.horizontalCenter font.pixelSize: 18 } - Rectangle { - id: connectButton - anchors.top: passwordInput.bottom - anchors.margins: 20 + Button { + style: root.buttonStyle + y: passwordInput.visible ? passwordInput.y + passwordInput.height + 20 : passwordInput.y anchors.horizontalCenter: parent.horizontalCenter - width: passwordInput.width - height: passwordInputBackground.height - enabled: wifiManager.networkState != WifiManager.ObtainingIPAddress - - gradient: Gradient { - GradientStop { position: 0; color: "white" } - GradientStop { position: 1; color: buttonMouse.pressed ? "steelblue" : "lightsteelblue" } - } - - border.color: "gray" - - Text { - anchors.centerIn: parent - font.pixelSize: 24 - text: connected ? "Disconnect" : "Connect" - } - MouseArea { - id: buttonMouse - anchors.fill: parent - onClicked: { - networkView.currentIndex = index - if (connected) { - wifiManager.disconnect() - } else { - networkView.activeNetwork = networkView.currentItem - wifiManager.connect(network, passwordInput.text); - } + text: connected ? "Disconnect" : "Connect" + onClicked: { + networkView.currentIndex = index + if (connected) { + wifiManager.disconnect() + } else { + networkView.activeNetwork = networkView.currentItem + wifiManager.connect(network, passwordInput.text); } } } - } } diff --git a/basicsuite/launchersettings/WifiGroupBox.qml b/basicsuite/launchersettings/WifiGroupBox.qml index f58c129..e88f5cb 100644 --- a/basicsuite/launchersettings/WifiGroupBox.qml +++ b/basicsuite/launchersettings/WifiGroupBox.qml @@ -60,6 +60,8 @@ ColumnLayout { Button { id: wifiOnOffButton + Layout.fillWidth: true + style: root.buttonStyle text: (wifiManager.backendReady) ? "Switch Off" : "Switch On" onClicked: { if (wifiManager.backendReady) { @@ -74,6 +76,8 @@ ColumnLayout { Button { id: listNetworksButton + Layout.fillWidth: true + style: root.buttonStyle visible: wifiManager.backendReady text: (networkList.visible) ? "Hide wifi networks" : "List available wifi networks" diff --git a/basicsuite/launchersettings/images/button_default.png b/basicsuite/launchersettings/images/button_default.png Binary files differnew file mode 100644 index 0000000..6d6cfd9 --- /dev/null +++ b/basicsuite/launchersettings/images/button_default.png diff --git a/basicsuite/launchersettings/images/button_pressed.png b/basicsuite/launchersettings/images/button_pressed.png Binary files differnew file mode 100644 index 0000000..ab78b6e --- /dev/null +++ b/basicsuite/launchersettings/images/button_pressed.png diff --git a/basicsuite/launchersettings/images/groupbox.png b/basicsuite/launchersettings/images/groupbox.png Binary files differnew file mode 100644 index 0000000..98585ee --- /dev/null +++ b/basicsuite/launchersettings/images/groupbox.png diff --git a/basicsuite/launchersettings/launchersettings.pro b/basicsuite/launchersettings/launchersettings.pro index bb0f2de..e89b4d0 100644 --- a/basicsuite/launchersettings/launchersettings.pro +++ b/basicsuite/launchersettings/launchersettings.pro @@ -5,7 +5,8 @@ b2qtdemo_deploy_defaults() content.files = *.qml content.path = $$DESTPATH +content.files += images OTHER_FILES += $${content.files} -INSTALLS += target content
\ No newline at end of file +INSTALLS += target content diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml index 41054fd..718bf69 100644 --- a/basicsuite/launchersettings/main.qml +++ b/basicsuite/launchersettings/main.qml @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at @@ -42,65 +42,115 @@ import QtQuick 2.0 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 +import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Private 1.0 Rectangle { id: root - - gradient: Gradient { - GradientStop { position: 0; color: "white" } - GradientStop { position: 1; color: "lightgray" } - } - width: 1280 height: 800 - + color: "#212126" property int margin: 10 - - Loader { - id: rebootActionLoader - source: "RebootAction.qml" - } - - Loader { - id: poweroffActionLoader - source: "PoweroffAction.qml" - } - - Loader { - id: brightnessControllerLoader - source: "BrightnessController.qml" + property alias buttonStyle: buttonStyle + + // ******************************* STYLES ********************************** + Component { + id: buttonStyle + ButtonStyle { + panel: Item { + implicitHeight: 50 + implicitWidth: 320 + BorderImage { + anchors.fill: parent + antialiasing: true + border.bottom: 8 + border.top: 8 + border.left: 8 + border.right: 8 + anchors.margins: control.pressed ? -4 : 0 + source: control.pressed ? "images/button_pressed.png" : "images/button_default.png" + Text { + text: control.text + anchors.centerIn: parent + color: "white" + font.pixelSize: 23 + renderType: Text.NativeRendering + } + } + } + } } - Loader { - id: networkControllerLoader - source: "NetworkController.qml" - } + // GroupBoxStyle currently is not available as a public API, so we write our own... + Component { + id: groupBoxStyle + Style { + // The margin from the content item to the groupbox + padding { + top: (control.title.length > 0 ? TextSingleton.implicitHeight : 0) + 30 + left: 8 + right: 8 + bottom: 8 + } + // The groupbox frame + property Component panel: Item { + anchors.fill: parent + + Text { + id: label + anchors.bottom: borderImage.top + anchors.margins: 2 + text: control.title + font.pixelSize: 22 + color: "white" + renderType: Text.NativeRendering + } - Loader { - id: wifiControllerLoader - source: "WifiController.qml" + BorderImage { + id: borderImage + anchors.fill: parent + anchors.topMargin: padding.top - 7 + source: "images/groupbox.png" + border.left: 4 + border.right: 4 + border.top: 4 + border.bottom: 4 + } + } + } } - ScrollView { + // ******************************** UI **************************************** + Loader { id: rebootActionLoader; source: "RebootAction.qml" } + Loader { id: poweroffActionLoader; source: "PoweroffAction.qml" } + Loader { id: brightnessControllerLoader; source: "BrightnessController.qml" } + Loader { id: networkControllerLoader; source: "NetworkController.qml" } + Loader { id: wifiControllerLoader; source: "WifiController.qml" } + Flickable { anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter anchors.margins: margin anchors.topMargin: 50 height: parent.height - width: mainLayout.width + 40 + width: mainLayout.width + contentHeight: mainLayout.height + 100 + contentWidth: mainLayout.width + flickableDirection: Flickable.VerticalFlick ColumnLayout { id: mainLayout - - height: implicitHeight; - width: Math.min(root.width, root.height); + width: 800 + height: implicitHeight + anchors.left: parent.left + anchors.right: parent.right GroupBox { id: powerOptions title: "Power" - Layout.fillWidth: true + style: groupBoxStyle + implicitWidth: 0 RowLayout { id: powerButtonRow @@ -108,13 +158,16 @@ Rectangle { anchors.fill: parent Button { + style: buttonStyle text: "Shut Down" Layout.fillWidth: true action: poweroffActionLoader.item; enabled: action != undefined + } Button { + style: buttonStyle text: "Reboot" Layout.fillWidth: true action: rebootActionLoader.item; @@ -127,8 +180,9 @@ Rectangle { GroupBox { id: displayOptions title: "Display" - + style: groupBoxStyle Layout.fillWidth: true + implicitWidth: 0 GridLayout { id: displayGrid @@ -137,8 +191,8 @@ Rectangle { flow: GridLayout.TopToBottom anchors.fill: parent - Label { text: "Brightness: "; } - Label { text: "Display FPS: "; } + Label { text: "Brightness: "; font.pixelSize: 18; color: "white" } + Label { text: "Display FPS: "; font.pixelSize: 18; color: "white" } Slider { maximumValue: 255 @@ -160,8 +214,9 @@ Rectangle { GroupBox { id: networkOptions title: "Network" - + style: groupBoxStyle Layout.fillWidth: true + implicitWidth: 0 GridLayout { id: networkGrid @@ -171,18 +226,26 @@ Rectangle { flow: GridLayout.TopToBottom anchors.fill: parent - Label { text: "Hostname: "; } - Label { text: "IP address: "; } + Label { text: "Hostname: "; font.pixelSize: 18; color: "white" } + Label { text: "IP address: "; font.pixelSize: 18; color: "white"} TextField { id: hostname + implicitHeight: hostnameButton.height - 8 text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getHostname(); } + font.pixelSize: 18 Layout.fillWidth: true } - Label { text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } } + Label { + text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } + font.pixelSize: 18 + color: "white" + } Button { + id: hostnameButton + style: buttonStyle text: "Change hostname" onClicked: networkControllerLoader.item.setHostname(hostname.text); enabled: networkControllerLoader.item != undefined @@ -194,6 +257,7 @@ Rectangle { GroupBox { id: wifiOptions title: "Wifi" + style: groupBoxStyle Layout.fillWidth: true } diff --git a/basicsuite/launchersettings/preview_l.jpg b/basicsuite/launchersettings/preview_l.jpg Binary files differindex 118edc4..b9b232b 100644 --- a/basicsuite/launchersettings/preview_l.jpg +++ b/basicsuite/launchersettings/preview_l.jpg diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml index a3d0ae2..b6c1b9e 100755 --- a/basicsuite/mediaplayer/ControlBar.qml +++ b/basicsuite/mediaplayer/ControlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/ImageButton.qml b/basicsuite/mediaplayer/ImageButton.qml index 3644f37..6dcb6dd 100755 --- a/basicsuite/mediaplayer/ImageButton.qml +++ b/basicsuite/mediaplayer/ImageButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/Intro.qml b/basicsuite/mediaplayer/Intro.qml index 5e1332f..094fe3e 100644 --- a/basicsuite/mediaplayer/Intro.qml +++ b/basicsuite/mediaplayer/Intro.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml index 4d45b75..c9a9ccf 100644 --- a/basicsuite/mediaplayer/MetadataView.qml +++ b/basicsuite/mediaplayer/MetadataView.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/PlaybackControl.qml b/basicsuite/mediaplayer/PlaybackControl.qml index f83f358..65bb7ca 100755 --- a/basicsuite/mediaplayer/PlaybackControl.qml +++ b/basicsuite/mediaplayer/PlaybackControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/SeekControl.qml b/basicsuite/mediaplayer/SeekControl.qml index 19a1fb7..9a75517 100755 --- a/basicsuite/mediaplayer/SeekControl.qml +++ b/basicsuite/mediaplayer/SeekControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/Slider.qml b/basicsuite/mediaplayer/Slider.qml index da9732f..20a3aa7 100644 --- a/basicsuite/mediaplayer/Slider.qml +++ b/basicsuite/mediaplayer/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml index c3cd648..5da4d64 100644 --- a/basicsuite/mediaplayer/UrlBar.qml +++ b/basicsuite/mediaplayer/UrlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml index 62375f1..9844350 100755 --- a/basicsuite/mediaplayer/VolumeControl.qml +++ b/basicsuite/mediaplayer/VolumeControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/mediaplayer/description.txt b/basicsuite/mediaplayer/description.txt index bf034e5..0868473 100644 --- a/basicsuite/mediaplayer/description.txt +++ b/basicsuite/mediaplayer/description.txt @@ -1,3 +1,3 @@ -The Media Player example demonstrates the use of the media playback features of Qt Multimedia with Qt Quick. +The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick. -It can play from a file or from Internet, both videos and music. +It can play content either from a file or a network source, both videos and music. diff --git a/basicsuite/mediaplayer/exclude.txt b/basicsuite/mediaplayer/exclude.txt index 952c994..9e012dd 100644 --- a/basicsuite/mediaplayer/exclude.txt +++ b/basicsuite/mediaplayer/exclude.txt @@ -1 +1,3 @@ -android-beagleboard: +android-beaglebone +android-emulator +linux-beaglebone diff --git a/basicsuite/photogallery/description.txt b/basicsuite/photogallery/description.txt index f5e302c..f47f907 100644 --- a/basicsuite/photogallery/description.txt +++ b/basicsuite/photogallery/description.txt @@ -1 +1 @@ -This is a simple photo gallery, showing images found in /data/images. +This is a simple photo gallery, showing images found in /data/images. Images captured with the Camera demo will also appear in this folder. diff --git a/basicsuite/photogallery/main.qml b/basicsuite/photogallery/main.qml index 5fbab8a..a7f114e 100644 --- a/basicsuite/photogallery/main.qml +++ b/basicsuite/photogallery/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-cinematicdemo/README b/basicsuite/qt5-cinematicdemo/README index 1f16c7e..37ef43e 100644 --- a/basicsuite/qt5-cinematicdemo/README +++ b/basicsuite/qt5-cinematicdemo/README @@ -44,6 +44,6 @@ License. http://creativecommons.org/licenses/by/3.0/ No attribution required, but feel free to mention us or contact info@quitcoding.com -Qt, and the Qt logo are trademarks of Nokia Corporation +Qt, and the Qt logo are trademarks of Digia Plc. Movie reviews copyright © IMDb.com DVD cover icons from http://www.iconarchive.com diff --git a/basicsuite/qt5-cinematicdemo/content/images/heading.png b/basicsuite/qt5-cinematicdemo/content/images/heading.png Binary files differindex 509b12b..c8a5586 100644 --- a/basicsuite/qt5-cinematicdemo/content/images/heading.png +++ b/basicsuite/qt5-cinematicdemo/content/images/heading.png diff --git a/basicsuite/qt5-cinematicdemo/content/images/heading_big.png b/basicsuite/qt5-cinematicdemo/content/images/heading_big.png Binary files differindex ec37388..3e3c7fc 100644 --- a/basicsuite/qt5-cinematicdemo/content/images/heading_big.png +++ b/basicsuite/qt5-cinematicdemo/content/images/heading_big.png diff --git a/basicsuite/qt5-everywhere/Button.qml b/basicsuite/qt5-everywhere/Button.qml index 43e93b8..d3b30a7 100644 --- a/basicsuite/qt5-everywhere/Button.qml +++ b/basicsuite/qt5-everywhere/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/Cloud.qml b/basicsuite/qt5-everywhere/Cloud.qml index b399308..00fce39 100644 --- a/basicsuite/qt5-everywhere/Cloud.qml +++ b/basicsuite/qt5-everywhere/Cloud.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/DialogButton.qml b/basicsuite/qt5-everywhere/DialogButton.qml index 7f24e5d..ff0e235 100644 --- a/basicsuite/qt5-everywhere/DialogButton.qml +++ b/basicsuite/qt5-everywhere/DialogButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/Element.qml b/basicsuite/qt5-everywhere/Element.qml index 097a3fc..8692f76 100644 --- a/basicsuite/qt5-everywhere/Element.qml +++ b/basicsuite/qt5-everywhere/Element.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/Group.qml b/basicsuite/qt5-everywhere/Group.qml index 6ee3304..b3c6aa3 100644 --- a/basicsuite/qt5-everywhere/Group.qml +++ b/basicsuite/qt5-everywhere/Group.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/HelpScreen.qml b/basicsuite/qt5-everywhere/HelpScreen.qml index 3fb540c..3f5980f 100644 --- a/basicsuite/qt5-everywhere/HelpScreen.qml +++ b/basicsuite/qt5-everywhere/HelpScreen.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/IslandElementContainer.qml b/basicsuite/qt5-everywhere/IslandElementContainer.qml index c191d68..66d1e64 100644 --- a/basicsuite/qt5-everywhere/IslandElementContainer.qml +++ b/basicsuite/qt5-everywhere/IslandElementContainer.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/NavigationPanel.qml b/basicsuite/qt5-everywhere/NavigationPanel.qml index e73cc7f..62d542b 100644 --- a/basicsuite/qt5-everywhere/NavigationPanel.qml +++ b/basicsuite/qt5-everywhere/NavigationPanel.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/QuitDialog.qml b/basicsuite/qt5-everywhere/QuitDialog.qml index 897afb9..c246fc7 100644 --- a/basicsuite/qt5-everywhere/QuitDialog.qml +++ b/basicsuite/qt5-everywhere/QuitDialog.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/Slide.qml b/basicsuite/qt5-everywhere/Slide.qml index 36e0b08..be94aca 100644 --- a/basicsuite/qt5-everywhere/Slide.qml +++ b/basicsuite/qt5-everywhere/Slide.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/SplashScreen.qml b/basicsuite/qt5-everywhere/SplashScreen.qml index 42dd8d3..10b99a5 100644 --- a/basicsuite/qt5-everywhere/SplashScreen.qml +++ b/basicsuite/qt5-everywhere/SplashScreen.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/WorldCanvas.qml b/basicsuite/qt5-everywhere/WorldCanvas.qml index f73116b..0972cf2 100644 --- a/basicsuite/qt5-everywhere/WorldCanvas.qml +++ b/basicsuite/qt5-everywhere/WorldCanvas.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/WorldMouseArea.qml b/basicsuite/qt5-everywhere/WorldMouseArea.qml index ee22054..f3a6620 100644 --- a/basicsuite/qt5-everywhere/WorldMouseArea.qml +++ b/basicsuite/qt5-everywhere/WorldMouseArea.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml b/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml index e2b3bb0..2a79735 100644 --- a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml +++ b/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -249,7 +249,7 @@ function drawPointer(context, angle, len, thickness, color){ if (root.dialStyle === 1) x1-=clockContainer.width*0.01 - context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px Arial' + context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px sans-serif' if (i >= 10) diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml index b0c2047..87b25c2 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml index dae206b..3a8fea9 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml index d85d292..2856cfb 100644 --- a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml +++ b/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
@@ -74,6 +74,8 @@ Rectangle { onStatusChanged: {
if (status == XmlListModel.Ready) {
playbanner.start();
+ } else if (status == XmlListModel.Error) {
+ networkErrorMessage.start();
}
}
}
@@ -139,6 +141,21 @@ Rectangle { pageSize: grid.visibleArea.widthRatio
}
+ Item {
+ id: networkErrorBox
+ opacity: 0
+ anchors.fill: parent
+
+ Text {
+ anchors.centerIn: parent
+ text: qsTr("Sorry! No network connection")
+ font.family: uiFont;
+ font.pixelSize: appHeaderFontSize;
+ color: textColor
+ smooth: true
+ }
+ }
+
SequentialAnimation {
id: playbanner
running: false
@@ -146,5 +163,14 @@ Rectangle { NumberAnimation { target: grid; property: "opacity"; to: 1.0; duration: 300}
}
+ NumberAnimation {
+ id: networkErrorMessage
+ running: false
+ target: networkErrorBox
+ property: "opacity"
+ to: 1.0
+ duration: 300
+ }
+
}
diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js b/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js index 467e431..d3ad154 100644 --- a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js +++ b/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml b/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml index 08b8f28..7594bdd 100644 --- a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml +++ b/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml @@ -1,6 +1,6 @@ /****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the examples of the Qt Toolkit.
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml index eb4e29e..ca1e55e 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml b/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml index fc74037..531b7c3 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml index c3f8253..235a2cd 100644 --- a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml +++ b/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml b/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml index 6ca2626..d96a9bd 100644 --- a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml +++ b/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml b/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml index 76635b6..11b687e 100644 --- a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml +++ b/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml b/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml index c107823..a491860 100644 --- a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml +++ b/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/radio/radio.qml b/basicsuite/qt5-everywhere/demos/radio/radio.qml index 8615f9b..e81c567 100644 --- a/basicsuite/qt5-everywhere/demos/radio/radio.qml +++ b/basicsuite/qt5-everywhere/demos/radio/radio.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -102,6 +102,22 @@ FocusScope { radius: height/2 + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: parent.width * 0.1 + text: qsTr("Sorry! No network connection") + font.pixelSize: stationList.height*.1; + color: "white" + smooth: true + } + } + PathView { enabled: root.activeFocus id: stationList @@ -214,6 +230,14 @@ FocusScope { query: "/radio/channel" XmlRole {name: "title"; query: "title/string()"} XmlRole {name: "url"; query: "url/string()"} + + onStatusChanged: { + if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0; + } else if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1; + } + } } VolumeButton { diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml index c16f582..97065b2 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml index 2916d1b..ae70e44 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml index 4050af6..7080312 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml index da26d6a..2f0591b 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml index d3cf4a6..02ad7ea 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml index 5eae0a0..213d9e8 100644 --- a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml +++ b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -67,6 +67,14 @@ Rectangle { XmlRole { name: "title"; query: "title/string()" } XmlRole { name: "link"; query: "link/string()" } XmlRole { name: "description"; query: "description/string()" } + + onStatusChanged: { + if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1.0 + } else if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0.0 + } + } } Row { @@ -93,9 +101,21 @@ Rectangle { width: window.width - window.listWidth; height: window.height model: feedModel delegate: NewsDelegate {} + + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.centerIn: parent + text: qsTr("Sorry! No network connection") + } + } } } + ScrollBar { scrollArea: list; height: list.height; width: 8; anchors.right: window.right } Rectangle { x: window.listWidth; height: window.height; width: 1; color: "#cccccc" } } diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml index 0b10b7f..b643f4e 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml index ba6261c..f2c975f 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml index 4b825ba..5fcc578 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml b/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml index 6e72161..3a9e59b 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml b/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml index fb050e7..0322c67 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml index 93089fc..c74b7a3 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml index fe758af..c448cba 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml index 3fe7fb1..166fcb8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml index 4f5b043..963565a 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml index 5ae4782..e389abd 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml index 46bc509..d4c4365 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml index 48ea399..d02f26d 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml index 7ac7ed8..0e6e0a8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml index 0b7a889..0467c5b 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml index 986f217..332af0f 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml index eff5182..9504baf 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml index 4438de1..d5d01f0 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml index ee48217..d602567 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml index 2b34baa..5dd42f8 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml index 280bbb1..87633b4 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml index 7661485..9d25e31 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml index c75d8e5..755268d 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js b/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js index 96b8167..9035b12 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js +++ b/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml b/basicsuite/qt5-everywhere/demos/samegame/samegame.qml index 49eab55..e81a8bf 100644 --- a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml +++ b/basicsuite/qt5-everywhere/demos/samegame/samegame.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml b/basicsuite/qt5-everywhere/demos/shaders/Logo.qml index 2e2617a..04bcd36 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/Logo.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml b/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml index 1237305..57b3505 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml b/basicsuite/qt5-everywhere/demos/shaders/Slider.qml index 5ceefcc..2e21010 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml +++ b/basicsuite/qt5-everywhere/demos/shaders/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro index d72fb60..af51461 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro +++ b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro @@ -1,13 +1,20 @@ -CXX_MODULE = qml +TEMPLATE = lib +CONFIG += plugin + TARGET = shaderreader -TARGETPATH = ShaderReader -IMPORT_VERSION = 1.0 -QT += quick +QT += qml quick SOURCES = main.cpp \ shaderfilereader.cpp \ HEADERS = shaderfilereader.h \ -load(qml_plugin) +pluginfiles.files += \ + qmldir \ + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/ShaderReader +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp index 0475ea8..fe03f0e 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp +++ b/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp index 1623fb7..629f4b7 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp +++ b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h index bfa82f7..30a68f3 100644 --- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h +++ b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml index 21160eb..e84d6b1 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml index 63f9646..9133158 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -97,7 +97,7 @@ Item { ButtonStyle { panel: Item { implicitHeight: 50 - implicitWidth: 320 + implicitWidth: 300 BorderImage { anchors.fill: parent antialiasing: true diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml index e0e7bcd..afaa951 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml index dc0f552..93adc7a 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -73,14 +73,14 @@ Item { ProgressBar { anchors.margins: 20 style: touchStyle - width: 400 + width: 300 value: progress } ProgressBar { anchors.margins: 20 style: touchStyle - width: 400 + width: 300 value: 1 - progress } @@ -88,7 +88,7 @@ Item { anchors.margins: 20 style: touchStyle value: 1 - width: 400 + width: 300 } } diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml index a1c0045..4a34037 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -53,16 +53,19 @@ Item { Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 0 } Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 0.5 } Slider { anchors.margins: 20 + width: 280 style: touchStyle value: 1.0 } diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml index c96314b..7731c33 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -84,7 +84,7 @@ Item { Text { anchors.centerIn: parent color: "white" - text: tab.title.toUpperCase() + text: styleData.title font.pixelSize: 16 } Rectangle { diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml index 605afef..0ed71f7 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -91,7 +91,7 @@ Item { font.pixelSize: 28 background: Item { implicitHeight: 50 - implicitWidth: 320 + implicitWidth: 300 BorderImage { source: "../images/textinput.png" border.left: 8 diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml index 95d737b..94089cf 100644 --- a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml +++ b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Quick Controls module of the Qt Toolkit. @@ -81,9 +81,9 @@ CustomAppWindow { } Text { - font.pixelSize: app.height*.07 + font.pixelSize: app.height*.06 Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} } - x: backButton.x + backButton.width + 20 + x: backButton.x + backButton.width + 10 anchors.verticalCenter: parent.verticalCenter color: "white" text: "Widget Gallery" diff --git a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml b/basicsuite/qt5-everywhere/demos/video/ControlBar.qml index c8e3b97..f013dcf 100644 --- a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml +++ b/basicsuite/qt5-everywhere/demos/video/ControlBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml b/basicsuite/qt5-everywhere/demos/video/ImageButton.qml index 937a075..428f6de 100644 --- a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml +++ b/basicsuite/qt5-everywhere/demos/video/ImageButton.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml b/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml index 9716825..2d7307e 100644 --- a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml index 37c2eab..8ac0d31 100644 --- a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml +++ b/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml b/basicsuite/qt5-everywhere/demos/video/SeekControl.qml index 8003951..2e037e3 100644 --- a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/SeekControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/Slider.qml b/basicsuite/qt5-everywhere/demos/video/Slider.qml index 8a99cfe..cc45537 100644 --- a/basicsuite/qt5-everywhere/demos/video/Slider.qml +++ b/basicsuite/qt5-everywhere/demos/video/Slider.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml index 6109f81..fedc9f4 100644 --- a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml +++ b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml b/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml index aa54e33..8ce8d83 100644 --- a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml +++ b/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. @@ -67,6 +67,29 @@ Item { XmlRole { name: "thumbnail"; query: "thumbnail/string()" } XmlRole { name: "title"; query: "title/string()" } XmlRole { name: "link"; query: "link/string()" } + + onStatusChanged: { + if (status == XmlListModel.Ready) { + networkErrorBox.opacity = 0.0 + } else if (status == XmlListModel.Error) { + networkErrorBox.opacity = 1.0 + } + } + } + + Item { + id: networkErrorBox + opacity: 0 + anchors.fill: parent + + Text { + anchors.centerIn: parent + text: qsTr("Sorry! No network connection") + font.family: uiFont; + font.pixelSize: tileFontSize * 2; + color: textColor + smooth: true + } } // Grid view diff --git a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml b/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml index 6e75fd2..4754951 100644 --- a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml +++ b/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/description.txt b/basicsuite/qt5-everywhere/description.txt index efa4b99..4846702 100644 --- a/basicsuite/qt5-everywhere/description.txt +++ b/basicsuite/qt5-everywhere/description.txt @@ -1 +1 @@ -This demo contains several Qt Quick 2 applications which you can launch by tapping the devices. +This demo shows how to use different user interface styles in several platforms and device types with one source code. It contains several Qt Quick 2 applications which you can launch by tapping each device. diff --git a/basicsuite/qt5-everywhere/engine.js b/basicsuite/qt5-everywhere/engine.js index 2618807..fdc9a5b 100644 --- a/basicsuite/qt5-everywhere/engine.js +++ b/basicsuite/qt5-everywhere/engine.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/main.qml b/basicsuite/qt5-everywhere/main.qml index 052e5eb..cf77887 100644 --- a/basicsuite/qt5-everywhere/main.qml +++ b/basicsuite/qt5-everywhere/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-everywhere/preview_l.jpg b/basicsuite/qt5-everywhere/preview_l.jpg Binary files differindex 1bb40bf..577a64c 100644 --- a/basicsuite/qt5-everywhere/preview_l.jpg +++ b/basicsuite/qt5-everywhere/preview_l.jpg diff --git a/basicsuite/qt5-everywhere/qt5-everywhere.pro b/basicsuite/qt5-everywhere/qt5-everywhere.pro index fab62cb..245d838 100644 --- a/basicsuite/qt5-everywhere/qt5-everywhere.pro +++ b/basicsuite/qt5-everywhere/qt5-everywhere.pro @@ -2,4 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += \ demos \ - app.pro
\ No newline at end of file + app.pro diff --git a/basicsuite/qt5-everywhere/style.js b/basicsuite/qt5-everywhere/style.js index a6a2966..6f09c42 100644 --- a/basicsuite/qt5-everywhere/style.js +++ b/basicsuite/qt5-everywhere/style.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-launchpresentation/CanvasSlide.qml b/basicsuite/qt5-launchpresentation/CanvasSlide.qml index d972b41..46f98ed 100644 --- a/basicsuite/qt5-launchpresentation/CanvasSlide.qml +++ b/basicsuite/qt5-launchpresentation/CanvasSlide.qml @@ -105,7 +105,7 @@ ctx.fill(); ctx.stroke(); ctx.fillStyle = 'aquamarine' -ctx.font = '20px sansserif' +ctx.font = '20px sans-serif' ctx.fillText('HTML Canvas API!', 100, 300); ctx.fillText('Imperative Drawing!', 100, 340); diff --git a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml b/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml index dc7cc02..542ec6f 100644 --- a/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml +++ b/basicsuite/qt5-launchpresentation/OpacityTransitionPresentation.qml @@ -51,8 +51,8 @@ Presentation { property bool inTransition: false; - property variant fromSlide; - property variant toSlide; + property variant fromSlide: Item { } + property variant toSlide: Item { } property int transitionTime: 500; diff --git a/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml b/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml index b0a9c77..ceb103f 100644 --- a/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml +++ b/basicsuite/qt5-launchpresentation/WebKitSlideContent.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-launchpresentation/WebkitSlide.qml b/basicsuite/qt5-launchpresentation/WebkitSlide.qml index 1873ab1..9febcdf 100644 --- a/basicsuite/qt5-launchpresentation/WebkitSlide.qml +++ b/basicsuite/qt5-launchpresentation/WebkitSlide.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/qt5-launchpresentation/description.txt b/basicsuite/qt5-launchpresentation/description.txt index 48d03f3..6ad8936 100644 --- a/basicsuite/qt5-launchpresentation/description.txt +++ b/basicsuite/qt5-launchpresentation/description.txt @@ -1,6 +1,5 @@ -The following is a quick tour of what is new in Qt 5. +The following is a quick tour of what is new in Qt 5. It is an application written with Qt Quick, based on Qt 5, the source code is available from [1]. The demo makes use of the QML Presentation System, available from [2]. Qt5 launch demo has been modified slightly to run in this launcher. -It is an application written with Qt Quick, based on Qt 5. The source code is available from: https://qt.gitorious.org/qt-labs/qt5-launch-demo -The demo makes use of the QML Presentation System, available from: ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git +[1] https://qt.gitorious.org/qt-labs/qt5-launch-demo +[2] ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git -The demo has been modified slightly to run in this launcher. diff --git a/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml b/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml index 2aa3617..2824e1d 100644 --- a/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml +++ b/basicsuite/qt5-launchpresentation/particles/velocityfrommotion.qml @@ -47,6 +47,7 @@ Item { height: 480 width: 320 + visible: true MouseArea { id: mouseArea diff --git a/basicsuite/qt5-launchpresentation/qt5-lauchpresentation.pro b/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro index c3aba46..c3aba46 100644 --- a/basicsuite/qt5-launchpresentation/qt5-lauchpresentation.pro +++ b/basicsuite/qt5-launchpresentation/qt5-launchpresentation.pro diff --git a/basicsuite/qt5-particlesdemo/content/burstandpulse.qml b/basicsuite/qt5-particlesdemo/content/burstandpulse.qml index c44c8dc..de140c3 100644 --- a/basicsuite/qt5-particlesdemo/content/burstandpulse.qml +++ b/basicsuite/qt5-particlesdemo/content/burstandpulse.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/customemitter.qml b/basicsuite/qt5-particlesdemo/content/customemitter.qml index bcf7da3..1c32cee 100644 --- a/basicsuite/qt5-particlesdemo/content/customemitter.qml +++ b/basicsuite/qt5-particlesdemo/content/customemitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/emitmask.qml b/basicsuite/qt5-particlesdemo/content/emitmask.qml index 575f9a1..c2b2b2f 100644 --- a/basicsuite/qt5-particlesdemo/content/emitmask.qml +++ b/basicsuite/qt5-particlesdemo/content/emitmask.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/maximumemitted.qml b/basicsuite/qt5-particlesdemo/content/maximumemitted.qml index cf87159..11c90fe 100644 --- a/basicsuite/qt5-particlesdemo/content/maximumemitted.qml +++ b/basicsuite/qt5-particlesdemo/content/maximumemitted.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/shapeanddirection.qml b/basicsuite/qt5-particlesdemo/content/shapeanddirection.qml index 9d5ea98..c8b7952 100644 --- a/basicsuite/qt5-particlesdemo/content/shapeanddirection.qml +++ b/basicsuite/qt5-particlesdemo/content/shapeanddirection.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/trailemitter.qml b/basicsuite/qt5-particlesdemo/content/trailemitter.qml index d876bbb..9278f78 100644 --- a/basicsuite/qt5-particlesdemo/content/trailemitter.qml +++ b/basicsuite/qt5-particlesdemo/content/trailemitter.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/content/velocityfrommotion.qml b/basicsuite/qt5-particlesdemo/content/velocityfrommotion.qml index 40698b1..280d8bf 100644 --- a/basicsuite/qt5-particlesdemo/content/velocityfrommotion.qml +++ b/basicsuite/qt5-particlesdemo/content/velocityfrommotion.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc b/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc index ead695c..b65f933 100644 --- a/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc +++ b/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -30,6 +30,8 @@ \ingroup b2qt-demos \brief This is a collection of examples using Emitters in the QML particle system. + \image b2qt-demo-qt5-particlesdemo.jpg + This is a collection of small QML examples relating to using Emitters in the particle system. Each example is a small QML file emphasizing a particular element or feature. diff --git a/basicsuite/qt5-particlesdemo/exclude.txt b/basicsuite/qt5-particlesdemo/exclude.txt new file mode 100644 index 0000000..0702cb5 --- /dev/null +++ b/basicsuite/qt5-particlesdemo/exclude.txt @@ -0,0 +1 @@ +all diff --git a/basicsuite/qt5-particlesdemo/main.cpp b/basicsuite/qt5-particlesdemo/main.cpp index 66e7ce4..15cb10b 100644 --- a/basicsuite/qt5-particlesdemo/main.cpp +++ b/basicsuite/qt5-particlesdemo/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/main.qml b/basicsuite/qt5-particlesdemo/main.qml index 2b9a338..d996b7b 100644 --- a/basicsuite/qt5-particlesdemo/main.qml +++ b/basicsuite/qt5-particlesdemo/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/shared/Button.qml b/basicsuite/qt5-particlesdemo/shared/Button.qml index 9bbc01a..0f85e75 100644 --- a/basicsuite/qt5-particlesdemo/shared/Button.qml +++ b/basicsuite/qt5-particlesdemo/shared/Button.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/shared/LauncherList.qml b/basicsuite/qt5-particlesdemo/shared/LauncherList.qml index 4336cf3..d18212a 100644 --- a/basicsuite/qt5-particlesdemo/shared/LauncherList.qml +++ b/basicsuite/qt5-particlesdemo/shared/LauncherList.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/shared/SimpleLauncherDelegate.qml b/basicsuite/qt5-particlesdemo/shared/SimpleLauncherDelegate.qml index e891266..2e9138b 100644 --- a/basicsuite/qt5-particlesdemo/shared/SimpleLauncherDelegate.qml +++ b/basicsuite/qt5-particlesdemo/shared/SimpleLauncherDelegate.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/qt5-particlesdemo/shared/shared.h b/basicsuite/qt5-particlesdemo/shared/shared.h index eab15f3..9370758 100644 --- a/basicsuite/qt5-particlesdemo/shared/shared.h +++ b/basicsuite/qt5-particlesdemo/shared/shared.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc b/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc index 35f28d0..c9921a1 100644 --- a/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc +++ b/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc @@ -31,8 +31,11 @@ \brief The Sensor Explorer example demonstrates how to read the meta-data of available sensors. \ingroup b2qt-demos - \section2 Sensor Explorer in QML + \image b2qt-demo-sensorexplorer.jpg + This example provides a list of all available sensors installed on the system for which Qt has + a backend. Start a sensor to see how values change depending from environment and user-device + interaction. This example is divided into two parts: diff --git a/basicsuite/sensorexplorer/exclude.txt b/basicsuite/sensorexplorer/exclude.txt new file mode 100644 index 0000000..0702cb5 --- /dev/null +++ b/basicsuite/sensorexplorer/exclude.txt @@ -0,0 +1 @@ +all diff --git a/basicsuite/sensorexplorer/imports/imports.pro b/basicsuite/sensorexplorer/imports/imports.pro index c596185..41a5f18 100644 --- a/basicsuite/sensorexplorer/imports/imports.pro +++ b/basicsuite/sensorexplorer/imports/imports.pro @@ -1,7 +1,7 @@ -CXX_MODULE = qml +TEMPLATE = lib +CONFIG += plugin + TARGET = sensorexplorer -TARGETPATH = Explorer -IMPORT_VERSION = 1.0 QT += qml sensors @@ -14,4 +14,11 @@ HEADERS = explorer.h \ sensoritem.h \ propertyinfo.h \ -load(qml_plugin) +pluginfiles.files += \ + qmldir \ + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/Explorer +target.path += $$B2QT_DEPLOYPATH +pluginfiles.path += $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/sensors/Accelbubble.qml b/basicsuite/sensors/Accelbubble.qml index d0ab880..7fba4d4 100644 --- a/basicsuite/sensors/Accelbubble.qml +++ b/basicsuite/sensors/Accelbubble.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/sensors/Light.qml b/basicsuite/sensors/Light.qml index fd71790..f997efd 100644 --- a/basicsuite/sensors/Light.qml +++ b/basicsuite/sensors/Light.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/sensors/description.txt b/basicsuite/sensors/description.txt index f6048cc..e306066 100644 --- a/basicsuite/sensors/description.txt +++ b/basicsuite/sensors/description.txt @@ -1,4 +1,3 @@ -This demo utilizes the accelerometer and light sensor readings in an application. +Demonstrates using the accelerometer and light sensors in a QML application. -For the accelometer, tilting the device moves the bubble around. For the light sensor, -exposing the device to different lighting conditions changes the display. +Tilting the device moves the bubble around, based on readings from the accelerometer sensor. For the light sensor, exposing the device to different lighting conditions changes the displayed image. diff --git a/basicsuite/sensors/exclude.txt b/basicsuite/sensors/exclude.txt new file mode 100644 index 0000000..e20e515 --- /dev/null +++ b/basicsuite/sensors/exclude.txt @@ -0,0 +1 @@ +android-beaglebone:android-iMX6:linux-iMX6:linux-raspberrypi:linux-beagleboard:linux-beaglebone diff --git a/basicsuite/sensors/main.qml b/basicsuite/sensors/main.qml index 359306c..b5a1207 100644 --- a/basicsuite/sensors/main.qml +++ b/basicsuite/sensors/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: For any questions to Digia, please use the contact form at ** http://qt.digia.com/ ** diff --git a/basicsuite/shared/loader.qml b/basicsuite/shared/SharedMain.qml index 42232d2..60a141b 100644 --- a/basicsuite/shared/loader.qml +++ b/basicsuite/shared/SharedMain.qml @@ -16,7 +16,7 @@ ** ****************************************************************************/ import QtQuick 2.0 -import QtVkb 1.0 +import QtQuick.Enterprise.VirtualKeyboard 1.0 Item { id: root @@ -59,4 +59,3 @@ Item { } } } - diff --git a/basicsuite/shared/engine.cpp b/basicsuite/shared/engine.cpp index 669bbf4..da021e5 100644 --- a/basicsuite/shared/engine.cpp +++ b/basicsuite/shared/engine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/shared/engine.h b/basicsuite/shared/engine.h index 78479db..1600fc6 100644 --- a/basicsuite/shared/engine.h +++ b/basicsuite/shared/engine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp index ac2fba4..808d5df 100644 --- a/basicsuite/shared/main.cpp +++ b/basicsuite/shared/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -16,8 +16,9 @@ ** ****************************************************************************/ #include <QtCore/QDebug> - -#include <QtGui/QGuiApplication> +// QtWidget (QApplication) dependecy is required by QtCharts demo, +// when QtWidget dependecy is not required use QGuiApplication from QtGui module +#include <QtWidgets/QApplication> #include <QtGui/QFont> #include <QtGui/QFontDatabase> #include <QtGui/QScreen> @@ -37,7 +38,7 @@ int main(int argc, char **argv) { //qputenv("QT_IM_MODULE", QByteArray("qtvkb")); - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QString path = app.applicationDirPath(); QPalette pal; @@ -74,7 +75,13 @@ int main(int argc, char **argv) view.rootContext()->setContextProperty("engine", &engine); view.setColor(Qt::black); view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile(path + QStringLiteral("/loader.qml"))); + + QSize screenSize = QGuiApplication::primaryScreen()->size(); + QString mainFile = screenSize.width() < screenSize.height() + ? QStringLiteral("/main_landscape.qml") + : QStringLiteral("/SharedMain.qml"); + + view.setSource(QUrl::fromLocalFile(path + mainFile)); view.show(); app.exec(); diff --git a/basicsuite/shared/main_landscape.qml b/basicsuite/shared/main_landscape.qml new file mode 100644 index 0000000..46b7fc5 --- /dev/null +++ b/basicsuite/shared/main_landscape.qml @@ -0,0 +1,30 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc +** All rights reserved. +** For any questions to Digia, please use 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 +** contact form at http://qt.digia.com +** +****************************************************************************/ +import QtQuick 2.0 + +Item { + width: 800 + height: 1280 + + SharedMain { + anchors.centerIn: parent + width: parent.height + height: parent.width + rotation: 90 + } +} diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index b785913..8f66b7d 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -1,4 +1,5 @@ -QT += quick +# widget dependecy is required by QtCharts demo +QT += quick widgets DESTPATH = /data/user/$$TARGET target.path = $$DESTPATH @@ -11,10 +12,13 @@ HEADERS += $$PWD/engine.h defineTest(b2qtdemo_deploy_defaults) { commonFiles.files = \ exclude.txt \ - ../shared/loader.qml + ../shared/SharedMain.qml \ + ../shared/main_landscape.qml commonFiles.path = $$DESTPATH OTHER_FILES += $${commonFiles.files} INSTALLS += commonFiles + export(commonFiles.files) + export(commonFiles.path) export(OTHER_FILES) export(INSTALLS) } diff --git a/basicsuite/textinput/ScrollBar.qml b/basicsuite/textinput/ScrollBar.qml index e6a8143..b4753f2 100644 --- a/basicsuite/textinput/ScrollBar.qml +++ b/basicsuite/textinput/ScrollBar.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml index cf337f6..490e066 100644 --- a/basicsuite/textinput/TextArea.qml +++ b/basicsuite/textinput/TextArea.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml index a26c6c6..67ee3e3 100644 --- a/basicsuite/textinput/TextBase.qml +++ b/basicsuite/textinput/TextBase.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml index aa6768e..9b01418 100644 --- a/basicsuite/textinput/TextField.qml +++ b/basicsuite/textinput/TextField.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/basicsuite/textinput/description.txt b/basicsuite/textinput/description.txt index d9b2f4f..5330313 100644 --- a/basicsuite/textinput/description.txt +++ b/basicsuite/textinput/description.txt @@ -1,3 +1,3 @@ -This examples illustrates how to handle input on touch devices. +This example illustrates how to handle input on touch devices. -The Boot to Qt stack comes with Qt Virtual Keyboard - a framework that consists of a C++ back end with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages. +Qt Enterprise Embedded comes with Qt Virtual Keyboard - a framework that consists of a C++ back end with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages. diff --git a/basicsuite/textinput/main.qml b/basicsuite/textinput/main.qml index b67d960..8f63b83 100644 --- a/basicsuite/textinput/main.qml +++ b/basicsuite/textinput/main.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT diff --git a/basicsuite/textinput/title.txt b/basicsuite/textinput/title.txt index 607f060..932c2f3 100644 --- a/basicsuite/textinput/title.txt +++ b/basicsuite/textinput/title.txt @@ -1 +1 @@ -Text Input +Virtual Keyboard |