From 173d934c701d6d8dc274d7dc7421dac63bf21e22 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 22 May 2018 09:37:17 +0300 Subject: Update Boot2Qt demos appearing in QtCreator New demos: E-Bike, Quick Controls 2 Gallery Removed demos: About B2Qt, Cinematic Demo, Camera, Data visualization, Canvas3D, Dashboard, Controls Gallery & Flat controls. Task-number: QTBUG-67917 Change-Id: I562737e7fd3e851e8a84cb3b71acc939a216032f Reviewed-by: Sami Nurmenniemi Reviewed-by: Tarja Sundqvist --- basicsuite/qtquickcontrols2/gallery.pro | 18 ---- basicsuite/qtquickcontrols2/qtquickcontrols2.pro | 18 ++++ doc/b2qt-demos.qdoc | 111 ++++------------------- 3 files changed, 34 insertions(+), 113 deletions(-) delete mode 100644 basicsuite/qtquickcontrols2/gallery.pro create mode 100644 basicsuite/qtquickcontrols2/qtquickcontrols2.pro diff --git a/basicsuite/qtquickcontrols2/gallery.pro b/basicsuite/qtquickcontrols2/gallery.pro deleted file mode 100644 index 9834b89..0000000 --- a/basicsuite/qtquickcontrols2/gallery.pro +++ /dev/null @@ -1,18 +0,0 @@ -TARGET = gallery - -include(../shared/shared.pri) -b2qtdemo_deploy_defaults() - -content.files = \ - main.qml \ - qtquickcontrols2.conf \ - icons/gallery/index.theme \ - $$files(icons/*.png, true) \ - $$files(images/*.png) \ - $$files(pages/*.qml) - -content.path = $$DESTPATH - -OTHER_FILES += $${content.files} - -INSTALLS += target content diff --git a/basicsuite/qtquickcontrols2/qtquickcontrols2.pro b/basicsuite/qtquickcontrols2/qtquickcontrols2.pro new file mode 100644 index 0000000..9834b89 --- /dev/null +++ b/basicsuite/qtquickcontrols2/qtquickcontrols2.pro @@ -0,0 +1,18 @@ +TARGET = gallery + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + main.qml \ + qtquickcontrols2.conf \ + icons/gallery/index.theme \ + $$files(icons/*.png, true) \ + $$files(images/*.png) \ + $$files(pages/*.qml) + +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index b399301..91122fe 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -63,32 +63,20 @@ */ /*! - \example basicsuite/about-b2qt - \title About Qt for Device Creation + \example basicsuite/ebike-ui + \title e-bike Demo \ingroup b2qt-demos - \brief Displays information about Qt for Device Creation. + \brief An E-bike instrument cluster concept. - \image b2qt-demo-about-b2qt.jpg + \image b2qt-demo-ebike-ui.jpg - A demo that provides an introduction to what Qt for Device Creation is all about. -*/ - -/*! - \example basicsuite/camera - \title Camera - \ingroup b2qt-demos - \brief Demonstrates using camera in a QML application. - - \image b2qt-demo-camera.jpg + An E-bike instrument cluster concept designed and implemented by Qt. - This example demonstrates the use of the camera features provided by Qt Multimedia with - Qt Quick. - - Demo can be used to take pictures. Files are saved inside the \c {/data/images/} folder - and can be then viewed with the \l {Photo Gallery} demo application. + The entire concept is a testament that Qt brings the HMI designers and Software engineers together + by using the same tools, allowing them to fast prototyping through collaborative workflow. + In addition to that, Qt is optimized for running on low end SoC even the ones that don't have GPU acceleration + for graphics. - Camera parameters such as flash mode, scene mode or white balance can be changed. The - availability of parameters depends on what the camera driver provides. */ /*! @@ -119,40 +107,6 @@ It can play from a file or from a network source, both videos and music. */ -/*! - \example basicsuite/canvas3d-planets - \title Qt Canvas3D Planets - \ingroup b2qt-demos - \brief Demonstrates the usage of Qt Canvas 3D, a WebGL-like API for QML, and popular JavaScript frameworks like three.js. - - \image b2qt-demo-canvas3d-planets.jpg - - The demo uses Qt Quick and Canvas 3D in combination with \l{http://threejs.org/}{three.js}, - \l{https://github.com/jeromeetienne/threex.planets}{threex.planets}, and Qt Quick - Controls. Tapping on a planet changes the view and moves to the chosen planet. Use the sliders - to adjust the zoom levels and viewing distance. Tapping outside the controls moves the focus - back to the solar view. -*/ - -/*! - \example basicsuite/qt5-cinematicdemo - \title Qt 5 Cinematic Demo - \ingroup b2qt-demos - \brief A cool demonstration of the graphical prowess of Qt 5 and Qt Quick 2. - - \image b2qt-demo-qt5-cinematicdemo.jpg - - The Qt5 Cinematic Experience is a demo by "QUIt Coding", a small group of talented individuals - enjoying software development with cutting edge technologies. They are official members of the - Qt Ambassador Program. - - The demo shows off a number features of Qt Quick 2.0. A nicely styled list control of movie - covers with lighting effects, particles and transitions. The information roll-down curvy - curtain is implemented using inline GLSL in the QML file. - - More awesome looking Qt Quick examples are available from \l {http://quitcoding.com}. -*/ - /*! \example basicsuite/textinput \title Text Input @@ -181,49 +135,16 @@ */ /*! - \example basicsuite/enterprise-dashboard - \title Dashboard - \ingroup b2qt-demos - \brief A car dashboard created using Qt Quick Enterprise Controls. - - \image b2qt-demo-enterprise-dashboard.jpg - - This example project demonstrates using several CircularGauge controls to create a car dashboard. -*/ - -/*! - \example basicsuite/enterprise-qtdatavis3d - \title Qt Data Visualization - \ingroup b2qt-demos - \brief An interactive showcase for Qt Data Visualization 3D. - - \image b2qt-demo-enterprise-qtdatavis3d.jpg - - This example demonstrates how to use the Qt Data Visualization module to display 3D data visualizations in QML. -*/ - -/*! - \example basicsuite/enterprise-gallery - \title Enterprise Controls Gallery - \ingroup b2qt-demos - \brief An interactive showcase for Qt Quick Enterprise Controls. - - \image b2qt-demo-enterprise-gallery.jpg - - This example project demonstrates the various UI controls provided by Qt Quick Enterprise Controls. -*/ - -/*! - \example basicsuite/enterprise-flat-controls - \title Enterprise Flat Controls + \example basicsuite/qtquickcontrols2 + \title Qt Quick Controls 2 - Gallery \ingroup b2qt-demos - \brief The Flat Style Gallery example showcases the Qt Quick Controls. + \brief A gallery of controls. - \image b2qt-demo-enterprise-flat-controls.jpg + \image b2qt-demo-qtquickcontrols2.jpg - This demo combines both the standard Quick Controls as well as the Qt Quick Enterprise Controls - both of which are using the new Flat style. The Flat style for Qt Quick Controls has a modern - look and feel and is perfect for the touch driven interfaces commonly developed by device creators. + The gallery example is a simple application with a drawer menu that contains all the Qt Quick Controls 2. Each + menu item opens a page that shows the graphical appearance of a control, allows you to interact with the control, + and explains in which circumstances it is handy to use this control. */ /*! -- cgit v1.2.3