From 751236e27b608794ce0753a96cc00c3c511e022b Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Wed, 27 Jan 2016 08:57:35 +0200 Subject: Replace title, description and exclude files with one demos.xml Change-Id: Ice4d810389ebf186cdfced3964c3a1c7e12e1ead Reviewed-by: Teemu Holappa --- basicsuite/about-b2qt/description.txt | 1 - basicsuite/about-b2qt/title.txt | 1 - basicsuite/camera/description.txt | 3 - basicsuite/camera/exclude.txt | 10 --- basicsuite/camera/title.txt | 1 - basicsuite/canvas3d-planets/description.txt | 1 - basicsuite/canvas3d-planets/exclude.txt | 4 - basicsuite/canvas3d-planets/title.txt | 1 - basicsuite/demos.xml | 90 ++++++++++++++++++++++ basicsuite/enterprise-charts/description.txt | 3 - basicsuite/enterprise-charts/title.txt | 1 - basicsuite/enterprise-dashboard/description.txt | 1 - basicsuite/enterprise-dashboard/title.txt | 1 - .../enterprise-flat-controls/description.txt | 1 - basicsuite/enterprise-flat-controls/title.txt | 1 - basicsuite/enterprise-qtdatavis3d/description.txt | 1 - basicsuite/enterprise-qtdatavis3d/exclude.txt | 4 - basicsuite/enterprise-qtdatavis3d/title.txt | 1 - basicsuite/graphicaleffects/description.txt | 4 - basicsuite/graphicaleffects/exclude.txt | 3 - basicsuite/graphicaleffects/title.txt | 1 - basicsuite/mediaplayer/description.txt | 3 - basicsuite/mediaplayer/exclude.txt | 4 - basicsuite/mediaplayer/title.txt | 1 - basicsuite/qt5-cinematicdemo/description.txt | 3 - basicsuite/qt5-cinematicdemo/title.txt | 1 - basicsuite/qtwebbrowser/description.txt | 3 - basicsuite/qtwebbrowser/exclude.txt | 4 - basicsuite/qtwebbrowser/title.txt | 1 - basicsuite/textinput/description.txt | 3 - basicsuite/textinput/title.txt | 1 - 31 files changed, 90 insertions(+), 68 deletions(-) delete mode 100644 basicsuite/about-b2qt/description.txt delete mode 100644 basicsuite/about-b2qt/title.txt delete mode 100644 basicsuite/camera/description.txt delete mode 100644 basicsuite/camera/exclude.txt delete mode 100644 basicsuite/camera/title.txt delete mode 100644 basicsuite/canvas3d-planets/description.txt delete mode 100644 basicsuite/canvas3d-planets/exclude.txt delete mode 100644 basicsuite/canvas3d-planets/title.txt create mode 100644 basicsuite/demos.xml delete mode 100644 basicsuite/enterprise-charts/description.txt delete mode 100644 basicsuite/enterprise-charts/title.txt delete mode 100644 basicsuite/enterprise-dashboard/description.txt delete mode 100644 basicsuite/enterprise-dashboard/title.txt delete mode 100644 basicsuite/enterprise-flat-controls/description.txt delete mode 100644 basicsuite/enterprise-flat-controls/title.txt delete mode 100644 basicsuite/enterprise-qtdatavis3d/description.txt delete mode 100644 basicsuite/enterprise-qtdatavis3d/exclude.txt delete mode 100644 basicsuite/enterprise-qtdatavis3d/title.txt delete mode 100644 basicsuite/graphicaleffects/description.txt delete mode 100644 basicsuite/graphicaleffects/exclude.txt delete mode 100644 basicsuite/graphicaleffects/title.txt delete mode 100644 basicsuite/mediaplayer/description.txt delete mode 100644 basicsuite/mediaplayer/exclude.txt delete mode 100644 basicsuite/mediaplayer/title.txt delete mode 100644 basicsuite/qt5-cinematicdemo/description.txt delete mode 100644 basicsuite/qt5-cinematicdemo/title.txt delete mode 100644 basicsuite/qtwebbrowser/description.txt delete mode 100644 basicsuite/qtwebbrowser/exclude.txt delete mode 100644 basicsuite/qtwebbrowser/title.txt delete mode 100644 basicsuite/textinput/description.txt delete mode 100644 basicsuite/textinput/title.txt diff --git a/basicsuite/about-b2qt/description.txt b/basicsuite/about-b2qt/description.txt deleted file mode 100644 index 55dd359..0000000 --- a/basicsuite/about-b2qt/description.txt +++ /dev/null @@ -1 +0,0 @@ -Provides an introduction to what Qt for Device Creation is all about. diff --git a/basicsuite/about-b2qt/title.txt b/basicsuite/about-b2qt/title.txt deleted file mode 100644 index 33ee752..0000000 --- a/basicsuite/about-b2qt/title.txt +++ /dev/null @@ -1 +0,0 @@ -000. About Qt for Device Creation diff --git a/basicsuite/camera/description.txt b/basicsuite/camera/description.txt deleted file mode 100644 index adfdafa..0000000 --- a/basicsuite/camera/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick. - -Demo can be used to take photos which are saved in the /data/images/ directory. 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. diff --git a/basicsuite/camera/exclude.txt b/basicsuite/camera/exclude.txt deleted file mode 100644 index 7706de5..0000000 --- a/basicsuite/camera/exclude.txt +++ /dev/null @@ -1,10 +0,0 @@ -android-beaglebone -android-iMX6 -android-emulator -android-nexus7v2 -linux-beagleboard -linux-beaglebone -linux-raspberrypi -linux-emulator -linux-apalis-imx6 -linux-colibri-vf diff --git a/basicsuite/camera/title.txt b/basicsuite/camera/title.txt deleted file mode 100644 index 0cf11f5..0000000 --- a/basicsuite/camera/title.txt +++ /dev/null @@ -1 +0,0 @@ -110. Camera diff --git a/basicsuite/canvas3d-planets/description.txt b/basicsuite/canvas3d-planets/description.txt deleted file mode 100644 index 18beb91..0000000 --- a/basicsuite/canvas3d-planets/description.txt +++ /dev/null @@ -1 +0,0 @@ -The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. diff --git a/basicsuite/canvas3d-planets/exclude.txt b/basicsuite/canvas3d-planets/exclude.txt deleted file mode 100644 index 95b02e4..0000000 --- a/basicsuite/canvas3d-planets/exclude.txt +++ /dev/null @@ -1,4 +0,0 @@ -linux-raspberrypi -linux-beaglebone -android-beaglebone -linux-colibri-vf diff --git a/basicsuite/canvas3d-planets/title.txt b/basicsuite/canvas3d-planets/title.txt deleted file mode 100644 index 855cad6..0000000 --- a/basicsuite/canvas3d-planets/title.txt +++ /dev/null @@ -1 +0,0 @@ -080. Qt Canvas3D - Planets diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml new file mode 100644 index 0000000..66f2b42 --- /dev/null +++ b/basicsuite/demos.xml @@ -0,0 +1,90 @@ + + + + + +Provides an introduction to what Qt for Device Creation is all about. + + + + + +This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick. + +Demo can be used to take photos which are saved in the /data/images/ directory. 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. + + + + + +The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. + + + + + +This demo presents different types of charts that are available from Qt Charts library. + +Qt Charts is part of the Qt Enterprise addons package which provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can be used as QWidgets, QGraphicsWidget, or QML types. + + + + + +The dashboard demo uses Qt Quick Extras to create a digital dashboard for a car. + + + + + +The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Extras 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. + + + + + +Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick 2. + + + + + +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. + + + + + +The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick. + +It can play content either from a file or a network source, both videos and music. + + + + + +The Qt5 Cinematic Experience is a demo by "QUIt Coding". + +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. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com. + + + + + +This example demonstrates the use of the QtWebEngine WebView with Qt Quick. + +Demo can be used to browse the internet (working network connection required) or run the offline web page demos. + + + + + +This example illustrates how to handle input on touch devices. + +Qt Enterprise Embedded comes with Qt Virtual Keyboard - a framework that consists of a C++ backend with support for custom input methods, as well as a reference keyboard front end implemented in QML, supporting multiple languages. + + + + diff --git a/basicsuite/enterprise-charts/description.txt b/basicsuite/enterprise-charts/description.txt deleted file mode 100644 index 6c8d488..0000000 --- a/basicsuite/enterprise-charts/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -This demo presents different types of charts that are available from Qt Charts library. - -Qt Charts is part of the Qt Enterprise addons package which provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be easily integrated to modern user interfaces. Qt Charts can be used as QWidgets, QGraphicsWidget, or QML types. diff --git a/basicsuite/enterprise-charts/title.txt b/basicsuite/enterprise-charts/title.txt deleted file mode 100644 index 2b4d97b..0000000 --- a/basicsuite/enterprise-charts/title.txt +++ /dev/null @@ -1 +0,0 @@ -090. Qt Charts - Gallery diff --git a/basicsuite/enterprise-dashboard/description.txt b/basicsuite/enterprise-dashboard/description.txt deleted file mode 100644 index 2e5780a..0000000 --- a/basicsuite/enterprise-dashboard/description.txt +++ /dev/null @@ -1 +0,0 @@ -The dashboard demo uses Qt Quick Extras to create a digital dashboard for a car. diff --git a/basicsuite/enterprise-dashboard/title.txt b/basicsuite/enterprise-dashboard/title.txt deleted file mode 100644 index 0cecefb..0000000 --- a/basicsuite/enterprise-dashboard/title.txt +++ /dev/null @@ -1 +0,0 @@ -060. Qt Quick Extras Dashboard diff --git a/basicsuite/enterprise-flat-controls/description.txt b/basicsuite/enterprise-flat-controls/description.txt deleted file mode 100644 index 98b01e5..0000000 --- a/basicsuite/enterprise-flat-controls/description.txt +++ /dev/null @@ -1 +0,0 @@ -The Flat Style Gallery example showcases the Qt Quick Controls. This demo combines both the standard Qt Quick Controls as well as the Qt Quick Extras 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. diff --git a/basicsuite/enterprise-flat-controls/title.txt b/basicsuite/enterprise-flat-controls/title.txt deleted file mode 100644 index 118f0e0..0000000 --- a/basicsuite/enterprise-flat-controls/title.txt +++ /dev/null @@ -1 +0,0 @@ -070. Qt Quick Controls - Flat Style Gallery diff --git a/basicsuite/enterprise-qtdatavis3d/description.txt b/basicsuite/enterprise-qtdatavis3d/description.txt deleted file mode 100644 index fbec419..0000000 --- a/basicsuite/enterprise-qtdatavis3d/description.txt +++ /dev/null @@ -1 +0,0 @@ -Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick 2. diff --git a/basicsuite/enterprise-qtdatavis3d/exclude.txt b/basicsuite/enterprise-qtdatavis3d/exclude.txt deleted file mode 100644 index 68318f3..0000000 --- a/basicsuite/enterprise-qtdatavis3d/exclude.txt +++ /dev/null @@ -1,4 +0,0 @@ -linux-raspberrypi -linux-raspberrypi2 -android-beaglebone -linux-colibri-vf diff --git a/basicsuite/enterprise-qtdatavis3d/title.txt b/basicsuite/enterprise-qtdatavis3d/title.txt deleted file mode 100644 index 2b34f13..0000000 --- a/basicsuite/enterprise-qtdatavis3d/title.txt +++ /dev/null @@ -1 +0,0 @@ -095. Qt Data Visualization 3D - Surface Multiseries diff --git a/basicsuite/graphicaleffects/description.txt b/basicsuite/graphicaleffects/description.txt deleted file mode 100644 index c19b2c4..0000000 --- a/basicsuite/graphicaleffects/description.txt +++ /dev/null @@ -1,4 +0,0 @@ -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/exclude.txt b/basicsuite/graphicaleffects/exclude.txt deleted file mode 100644 index 6ae8492..0000000 --- a/basicsuite/graphicaleffects/exclude.txt +++ /dev/null @@ -1,3 +0,0 @@ -linux-beaglebone -android-beaglebone -linux-colibri-vf diff --git a/basicsuite/graphicaleffects/title.txt b/basicsuite/graphicaleffects/title.txt deleted file mode 100644 index a679fff..0000000 --- a/basicsuite/graphicaleffects/title.txt +++ /dev/null @@ -1 +0,0 @@ -130. Graphical Effects diff --git a/basicsuite/mediaplayer/description.txt b/basicsuite/mediaplayer/description.txt deleted file mode 100644 index 0868473..0000000 --- a/basicsuite/mediaplayer/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick. - -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 deleted file mode 100644 index 5b8c71f..0000000 --- a/basicsuite/mediaplayer/exclude.txt +++ /dev/null @@ -1,4 +0,0 @@ -android-beaglebone -android-emulator -linux-beaglebone -linux-colibri-vf diff --git a/basicsuite/mediaplayer/title.txt b/basicsuite/mediaplayer/title.txt deleted file mode 100644 index a752761..0000000 --- a/basicsuite/mediaplayer/title.txt +++ /dev/null @@ -1 +0,0 @@ -100. Media Player diff --git a/basicsuite/qt5-cinematicdemo/description.txt b/basicsuite/qt5-cinematicdemo/description.txt deleted file mode 100644 index c78f386..0000000 --- a/basicsuite/qt5-cinematicdemo/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -The Qt5 Cinematic Experience is a demo by "QUIt Coding". - -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. The source code for this demo and more awesome looking Qt Quick examples are available from quitcoding.com. diff --git a/basicsuite/qt5-cinematicdemo/title.txt b/basicsuite/qt5-cinematicdemo/title.txt deleted file mode 100644 index 8774828..0000000 --- a/basicsuite/qt5-cinematicdemo/title.txt +++ /dev/null @@ -1 +0,0 @@ -030. Qt5 Cinematic Demo diff --git a/basicsuite/qtwebbrowser/description.txt b/basicsuite/qtwebbrowser/description.txt deleted file mode 100644 index 0a4cf41..0000000 --- a/basicsuite/qtwebbrowser/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -This example demonstrates the use of the QtWebEngine WebView with Qt Quick. - -Demo can be used to browse the internet (working network connection required) or run the offline web page demos. diff --git a/basicsuite/qtwebbrowser/exclude.txt b/basicsuite/qtwebbrowser/exclude.txt deleted file mode 100644 index f5dba0c..0000000 --- a/basicsuite/qtwebbrowser/exclude.txt +++ /dev/null @@ -1,4 +0,0 @@ -linux-emulator -linux-raspberrypi -linux-beaglebone -linux-colibri-vf diff --git a/basicsuite/qtwebbrowser/title.txt b/basicsuite/qtwebbrowser/title.txt deleted file mode 100644 index cb3e9f2..0000000 --- a/basicsuite/qtwebbrowser/title.txt +++ /dev/null @@ -1 +0,0 @@ -900. Web Browser diff --git a/basicsuite/textinput/description.txt b/basicsuite/textinput/description.txt deleted file mode 100644 index 5330313..0000000 --- a/basicsuite/textinput/description.txt +++ /dev/null @@ -1,3 +0,0 @@ -This example illustrates how to handle input on touch devices. - -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/title.txt b/basicsuite/textinput/title.txt deleted file mode 100644 index 8e845f4..0000000 --- a/basicsuite/textinput/title.txt +++ /dev/null @@ -1 +0,0 @@ -050. Virtual Keyboard -- cgit v1.2.3 From 6175a1ca037552ab237c6418233d7135753cf48d Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Thu, 4 Feb 2016 09:52:05 +0200 Subject: Added audio formats to mediaplayer's file filters. Change-Id: I808b37280fa7540cdb9120e28278913c152d5019 Reviewed-by: Katja Marttila --- basicsuite/mediaplayer/FileBrowser.qml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/basicsuite/mediaplayer/FileBrowser.qml b/basicsuite/mediaplayer/FileBrowser.qml index 1c81194..ea31e7c 100644 --- a/basicsuite/mediaplayer/FileBrowser.qml +++ b/basicsuite/mediaplayer/FileBrowser.qml @@ -78,7 +78,10 @@ Item { "*.f4a", "*.f4b", "*.gif", "*.gifv", "*.m4v", "*.mkv", "*.mng", "*.mov", "*.qt", "*.mp4", "*.m4p", "*.m4v", "*.mpg", "*.mp2", "*.mpeg", "*.mpe", "*.mpv", "*.m2v", "*.mxf", "*.nsv", "*.ogv", "*.ogg", "*.rm", "*.rmvb", "*.roq", "*.svi", "*.vob", - "*.webm", "*.wmv", "*.yuv"] + "*.webm", "*.wmv", "*.yuv", "*.aa", "*.aac", "*.aax", "*.act", "*.aiff", "*.amr", + "*.ape", "*.au", "*.awb", "*.dct", "*.dss", "*.flac", "*.gsm", "*.m4a", "*.m4b", + "*.m4p", "*.mp3", "*.mpc", "*.ogg", "*.oga", "*.vox", "*.wav", "*.wma" + ] } Component { -- cgit v1.2.3 From 61717fcee51af858bb7a3bb78fd8a6635489a0bf Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 12 Feb 2016 16:24:55 +0100 Subject: Update qtwebbrowser submodule to fix keyboard issue Task-number: QTEE-1066 Change-Id: I25256035508055edf8a8e5f43cfd91c6ea45ab76 Reviewed-by: Samuli Piippo --- basicsuite/qtwebbrowser/tqtc-qtwebbrowser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser index 60a8ef7..c86bb8a 160000 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser @@ -1 +1 @@ -Subproject commit 60a8ef724c11c35413d42ef1ccd118e9c4f6c3c9 +Subproject commit c86bb8a400f79be205025598310926df5d01c7bc -- cgit v1.2.3 From ed50a72433d401176635b946e48481736e98ae6b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Sun, 14 Feb 2016 17:28:22 +0200 Subject: export wayland demo Change-Id: I7d27c72b6b98853733fa53b50f48a90c071bbf69 Reviewed-by: Teemu Holappa --- .export | 1 + 1 file changed, 1 insertion(+) diff --git a/.export b/.export index a8d1f44..b3c5721 100644 --- a/.export +++ b/.export @@ -1 +1,2 @@ basicsuite +wayland -- cgit v1.2.3 From d9d77da89ac7fea96fae940b74c0dfc2225d0b52 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 16 Feb 2016 09:05:25 +0200 Subject: doc: update demos used in docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove demos no longer used and add new ones. Demos are now installed to Demos/B2Qt-5.6/basicsuite. Change-Id: I2ebe4fac44631a776c27e849109c0c2eb24026ab Reviewed-by: Topi Reiniö --- doc/b2qt-demos.qdoc | 83 ++++++------------------------ doc/b2qt-demos.qdocconf | 2 +- doc/images/b2qt-demo-canvas3d-planets.jpg | 1 + doc/images/b2qt-demo-controls-touch.jpg | 1 - doc/images/b2qt-demo-planets.jpg | 1 - doc/images/b2qt-demo-qt5-everywhere.jpg | 1 - doc/images/b2qt-demo-qt5-particlesdemo.jpg | 1 - doc/images/b2qt-demo-qtwebbrowser.jpg | 1 + doc/images/b2qt-demo-sensorexplorer.jpg | 1 - doc/images/b2qt-demo-sensors.jpg | 1 - doc/images/b2qt-demo-webengine.jpg | 1 - 11 files changed, 20 insertions(+), 74 deletions(-) create mode 120000 doc/images/b2qt-demo-canvas3d-planets.jpg delete mode 120000 doc/images/b2qt-demo-controls-touch.jpg delete mode 120000 doc/images/b2qt-demo-planets.jpg delete mode 120000 doc/images/b2qt-demo-qt5-everywhere.jpg delete mode 120000 doc/images/b2qt-demo-qt5-particlesdemo.jpg create mode 120000 doc/images/b2qt-demo-qtwebbrowser.jpg delete mode 120000 doc/images/b2qt-demo-sensorexplorer.jpg delete mode 120000 doc/images/b2qt-demo-sensors.jpg delete mode 120000 doc/images/b2qt-demo-webengine.jpg diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc index 84309d6..66ad73c 100644 --- a/doc/b2qt-demos.qdoc +++ b/doc/b2qt-demos.qdoc @@ -32,7 +32,7 @@ */ /*! - \example about-b2qt + \example basicsuite/about-b2qt \title About Qt for Device Creation \ingroup b2qt-demos \brief Displays information about Qt for Device Creation. @@ -43,7 +43,7 @@ */ /*! - \example camera + \example basicsuite/camera \title Camera \ingroup b2qt-demos \brief Demonstrates using camera in a QML application. @@ -61,22 +61,7 @@ */ /*! - \example controls-touch - \title Controls Touch - \ingroup b2qt-demos - \brief Demonstrates a touch UI implemented with Qt Quick Controls. - - \image b2qt-demo-controls-touch.jpg - - The purpose of this example is to show Qt Quick Controls in practice. The example uses a - StackView to navigate between pages and illustrates the use of many of the controls provided - by Qt Quick Control, including Button, Slider, ProgressBar, TabBar and TextInput types. The - style in the example is a custom style made to look like the Android theme, it is written - purely in QML. -*/ - -/*! - \example graphicaleffects + \example basicsuite/graphicaleffects \title Graphical Effects \ingroup b2qt-demos \brief Demonstrates the different graphical effects that can be used in a QML application. @@ -91,7 +76,7 @@ */ /*! - \example mediaplayer + \example basicsuite/mediaplayer \title Media Player \ingroup b2qt-demos \brief A media player implemented in QML. @@ -104,12 +89,12 @@ */ /*! - \example canvas3d-planets + \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-planets.jpg + \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 @@ -119,7 +104,7 @@ */ /*! - \example qt5-cinematicdemo + \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. @@ -138,34 +123,7 @@ */ /*! - \example qt5-everywhere - \title Qt 5 Everywhere - \ingroup b2qt-demos - \brief Highlights the versatility and cross-platform capability of Qt - - \image b2qt-demo-qt5-everywhere.jpg - - The Qt 5 Everywhere demo shows how to use different user interface styles in several platforms - and device types with one source code. - - The demo contains several Qt Quick 2 applications which you can launch by tapping the devices. -*/ - -/*! - \example sensors - \title Sensors - \ingroup b2qt-demos - \brief Demonstrates using the accelerometer and light sensors in a QML application. - - \image b2qt-demo-sensors.jpg - - 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. -*/ - -/*! - \example textinput + \example basicsuite/textinput \title Text Input \ingroup b2qt-demos \brief Demonstrates text input capabilities and the virtual keyboard in a QML application. @@ -180,7 +138,7 @@ */ /*! - \example enterprise-charts + \example basicsuite/enterprise-charts \title Charts \ingroup b2qt-demos \brief Showcases the different types of charts available from the Qt Charts library. @@ -192,7 +150,7 @@ */ /*! - \example enterprise-dashboard + \example basicsuite/enterprise-dashboard \title Dashboard \ingroup b2qt-demos \brief A car dashboard created using Qt Quick Enterprise Controls. @@ -203,7 +161,7 @@ */ /*! - \example enterprise-qtdatavis3d + \example basicsuite/enterprise-qtdatavis3d \title Qt Data Visualization \ingroup b2qt-demos \brief An interactive showcase for Qt Data Visualization 3D. @@ -214,7 +172,7 @@ */ /*! - \example enterprise-gallery + \example basicsuite/enterprise-gallery \title Enterprise Controls Gallery \ingroup b2qt-demos \brief An interactive showcase for Qt Quick Enterprise Controls. @@ -225,7 +183,7 @@ */ /*! - \example enterprise-flat-controls + \example basicsuite/enterprise-flat-controls \title Enterprise Flat Controls \ingroup b2qt-demos \brief The Flat Style Gallery example showcases the Qt Quick Controls. @@ -238,20 +196,13 @@ */ /*! - \example launchersettings - \title Launcher Settings - \ingroup b2qt-demos - \brief Displays information and settings available for the Boot to Qt launcher. -*/ - -/*! - \example webengine - \title Qt WebEngine Browser Demo + \example basicsuite/qtwebbrowser + \title Qt Web Browser Demo \ingroup b2qt-demos \brief This example demonstrates the use of the QtWebEngine WebView with Qt Quick. - \image b2qt-demo-webengine.jpg + \image b2qt-demo-qtwebbrowser.jpg The example can be used to browse the internet (working network connection - required) or run the off-line WebGL demo. + required). */ diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf index dde8219..a5612b9 100644 --- a/doc/b2qt-demos.qdocconf +++ b/doc/b2qt-demos.qdocconf @@ -16,7 +16,7 @@ sources.fileextensions = "*.qdoc" examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css" examples.imageextensions = "*.png *.jpg *.gif" -exampledirs = ../basicsuite +exampledirs = .. qhp.projects = QtforDeviceCreationDemos diff --git a/doc/images/b2qt-demo-canvas3d-planets.jpg b/doc/images/b2qt-demo-canvas3d-planets.jpg new file mode 120000 index 0000000..8c8b33e --- /dev/null +++ b/doc/images/b2qt-demo-canvas3d-planets.jpg @@ -0,0 +1 @@ +../../basicsuite/canvas3d-planets/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-controls-touch.jpg b/doc/images/b2qt-demo-controls-touch.jpg deleted file mode 120000 index bd78fcf..0000000 --- a/doc/images/b2qt-demo-controls-touch.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/controls-touch/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-planets.jpg b/doc/images/b2qt-demo-planets.jpg deleted file mode 120000 index 8c8b33e..0000000 --- a/doc/images/b2qt-demo-planets.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/canvas3d-planets/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-everywhere.jpg b/doc/images/b2qt-demo-qt5-everywhere.jpg deleted file mode 120000 index 0c61cdb..0000000 --- a/doc/images/b2qt-demo-qt5-everywhere.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/qt5-everywhere/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-qt5-particlesdemo.jpg b/doc/images/b2qt-demo-qt5-particlesdemo.jpg deleted file mode 120000 index 42553b8..0000000 --- a/doc/images/b2qt-demo-qt5-particlesdemo.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/qt5-particlesdemo/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-qtwebbrowser.jpg b/doc/images/b2qt-demo-qtwebbrowser.jpg new file mode 120000 index 0000000..13dea2f --- /dev/null +++ b/doc/images/b2qt-demo-qtwebbrowser.jpg @@ -0,0 +1 @@ +../../basicsuite/qtwebbrowser/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-sensorexplorer.jpg b/doc/images/b2qt-demo-sensorexplorer.jpg deleted file mode 120000 index 4c2797f..0000000 --- a/doc/images/b2qt-demo-sensorexplorer.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/sensorexplorer/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-sensors.jpg b/doc/images/b2qt-demo-sensors.jpg deleted file mode 120000 index 4144c1c..0000000 --- a/doc/images/b2qt-demo-sensors.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/sensors/preview_l.jpg \ No newline at end of file diff --git a/doc/images/b2qt-demo-webengine.jpg b/doc/images/b2qt-demo-webengine.jpg deleted file mode 120000 index 5d319d8..0000000 --- a/doc/images/b2qt-demo-webengine.jpg +++ /dev/null @@ -1 +0,0 @@ -../../basicsuite/webengine/preview_l.jpg \ No newline at end of file -- cgit v1.2.3 From 2fa8f1c6cb2c9cc9719f9ac654c0083946376333 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Fri, 19 Feb 2016 15:19:16 +0200 Subject: change about-b2qt background to white text is not seen with black background Change-Id: I1638a808564b32b6343901703fd16e06365bd297 Task-number: QTEE-1067 Reviewed-by: Kimmo Ollila --- basicsuite/about-b2qt/main.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basicsuite/about-b2qt/main.qml b/basicsuite/about-b2qt/main.qml index e0d86ac..38564ea 100644 --- a/basicsuite/about-b2qt/main.qml +++ b/basicsuite/about-b2qt/main.qml @@ -42,9 +42,9 @@ import QtQuick 2.0 import QtQuick.Particles 2.0 import QtQuick.Window 2.1 -Item { +Rectangle { id: root - + color: "white" width : Screen.height > Screen.width ? Screen.height : Screen.width height : Screen.height > Screen.width ? Screen.width : Screen.height -- cgit v1.2.3 From a5bd56386dc392e6c756240f094c582f3b3ee497 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Thu, 25 Feb 2016 09:53:44 +0200 Subject: change button background color from white to black Change-Id: I201e86316a1678d15008a994a0c79687c410b752 Task-number: QTEE-1069 Reviewed-by: Kimmo Ollila --- basicsuite/enterprise-qtdatavis3d/main.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/basicsuite/enterprise-qtdatavis3d/main.qml b/basicsuite/enterprise-qtdatavis3d/main.qml index 8651f2d..34da6ed 100644 --- a/basicsuite/enterprise-qtdatavis3d/main.qml +++ b/basicsuite/enterprise-qtdatavis3d/main.qml @@ -24,9 +24,9 @@ import QtQuick.Extras 1.4 import QtDataVisualization 1.0 import "." -Item { +Rectangle { id: mainview - + color: "black" Item { id: surfaceView width: mainview.width - buttonLayout.width -- cgit v1.2.3