From a8f1f9490ef8358e0b8b87f0898921c651b76a02 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 1 Mar 2016 08:11:47 +0200 Subject: Exclude canvas3d planets demo from RPi2 Change-Id: I4e1c4662af1d66dd4aad760cc22fc3a5ca8f090d Task-number: QTBUG-51566 Reviewed-by: Teemu Holappa --- basicsuite/demos.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml index 66f2b42..b235c55 100644 --- a/basicsuite/demos.xml +++ b/basicsuite/demos.xml @@ -15,7 +15,7 @@ Demo can be used to take photos which are saved in the /data/images/ directory. - + The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. -- cgit v1.2.3 From 7076d480edb69cc7d42594acbce00f3a563ed94c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 1 Mar 2016 08:19:50 +0200 Subject: Remove android from exclude list Android is no longer supported. Change-Id: I7bf7d5f095d61932a2cfa85f1a8ec5952b80ae6d Reviewed-by: Kimmo Ollila --- basicsuite/demos.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml index b235c55..7052f5a 100644 --- a/basicsuite/demos.xml +++ b/basicsuite/demos.xml @@ -7,7 +7,7 @@ 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. @@ -15,7 +15,7 @@ Demo can be used to take photos which are saved in the /data/images/ directory. - + The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. @@ -41,13 +41,13 @@ The Flat Style Gallery example showcases the Qt Quick Controls. This demo combin - + 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. @@ -55,7 +55,7 @@ However, as UIs typically reuse many of the same effects, the Qt Graphical Effec - + The Media Player example demonstrates the use of media playback features provided by Qt Multimedia with Qt Quick. -- cgit v1.2.3 From cdaf26d23204a0a745885ab0db886388618d50db Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Mar 2016 10:46:13 +0200 Subject: qtwebbrowser: add pro file to create stand-alone application Current pro file only creates the qml plugin needed to run QtWebBrowser demo from the qtlauncher. Add separate pro file for creating the application that can be deployed and launched from QtCreator. Additionally use the resource file from tqtc-qtwebbrowser, so we can use the qml files from the qml plugin instead of filesystem. Task-number: QTEE-1083 Change-Id: I700824fc82d70c40379a4e97513b7e3947be6fdd Reviewed-by: Kimmo Ollila --- basicsuite/qtwebbrowser/app.pro | 13 +++++++++++++ basicsuite/qtwebbrowser/lib.pro | 29 +++++++++++++++++++++++++++++ basicsuite/qtwebbrowser/main.qml | 3 ++- basicsuite/qtwebbrowser/qtwebbrowser.pro | 31 ++++--------------------------- 4 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 basicsuite/qtwebbrowser/app.pro create mode 100644 basicsuite/qtwebbrowser/lib.pro diff --git a/basicsuite/qtwebbrowser/app.pro b/basicsuite/qtwebbrowser/app.pro new file mode 100644 index 0000000..eda1be9 --- /dev/null +++ b/basicsuite/qtwebbrowser/app.pro @@ -0,0 +1,13 @@ +TARGET = qtwebbrowser + +include(../shared/shared.pri) +b2qtdemo_deploy_defaults() + +content.files = \ + *.qml \ + *.png +content.path = $$DESTPATH + +OTHER_FILES += $${content.files} + +INSTALLS += target content diff --git a/basicsuite/qtwebbrowser/lib.pro b/basicsuite/qtwebbrowser/lib.pro new file mode 100644 index 0000000..16152f2 --- /dev/null +++ b/basicsuite/qtwebbrowser/lib.pro @@ -0,0 +1,29 @@ +TEMPLATE = lib +TARGET = webbrowser +QT += qml quick +CONFIG += qt plugin + +INCLUDEPATH += tqtc-qtwebbrowser/src + +HEADERS += \ + tqtc-qtwebbrowser/src/appengine.h \ + tqtc-qtwebbrowser/src/touchtracker.h \ + tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h + +SOURCES += \ + plugin.cpp \ + tqtc-qtwebbrowser/src/appengine.cpp \ + tqtc-qtwebbrowser/src/touchtracker.cpp \ + tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp + +pluginfiles.files += \ + qmldir + +RESOURCES += tqtc-qtwebbrowser/src/resources.qrc + +B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser + +target.path = $$B2QT_DEPLOYPATH +pluginfiles.path = $$B2QT_DEPLOYPATH + +INSTALLS += target pluginfiles diff --git a/basicsuite/qtwebbrowser/main.qml b/basicsuite/qtwebbrowser/main.qml index dcca154..c0f795c 100644 --- a/basicsuite/qtwebbrowser/main.qml +++ b/basicsuite/qtwebbrowser/main.qml @@ -1,5 +1,6 @@ import QtQuick 2.0 +import WebBrowser 1.0 Loader { - source: "tqtc-qtwebbrowser/src/qml/BrowserWindow.qml" + source: "qrc:/qml/BrowserWindow.qml" } diff --git a/basicsuite/qtwebbrowser/qtwebbrowser.pro b/basicsuite/qtwebbrowser/qtwebbrowser.pro index 8532344..dc2f809 100644 --- a/basicsuite/qtwebbrowser/qtwebbrowser.pro +++ b/basicsuite/qtwebbrowser/qtwebbrowser.pro @@ -1,27 +1,4 @@ -TEMPLATE = lib -TARGET = webbrowser -QT += qml quick -CONFIG += qt plugin - -INCLUDEPATH += tqtc-qtwebbrowser/src - -HEADERS += \ - tqtc-qtwebbrowser/src/appengine.h \ - tqtc-qtwebbrowser/src/touchtracker.h \ - tqtc-qtwebbrowser/src/navigationhistoryproxymodel.h - -SOURCES += \ - plugin.cpp \ - tqtc-qtwebbrowser/src/appengine.cpp \ - tqtc-qtwebbrowser/src/touchtracker.cpp \ - tqtc-qtwebbrowser/src/navigationhistoryproxymodel.cpp - -pluginfiles.files += \ - qmldir - -B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/WebBrowser - -target.path = $$B2QT_DEPLOYPATH -pluginfiles.path = $$B2QT_DEPLOYPATH - -INSTALLS += target pluginfiles +TEMPLATE = subdirs +SUBDIRS += \ + lib.pro \ + app.pro -- cgit v1.2.3 From 15ce4b3327f0815900e4453f2f83e4eb898e1d82 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 17 Feb 2016 11:58:54 +0100 Subject: New icons Change-Id: Ibb6c7c52dc9004268fc4ff501fc5a38b25743d25 Reviewed-by: Samuli Piippo --- wayland/democompositor/democompositor.qrc | 8 ++++---- wayland/democompositor/images/Icon_Clocks.png | Bin 0 -> 1870 bytes wayland/democompositor/images/Icon_Maps.png | Bin 0 -> 1529 bytes wayland/democompositor/images/Icon_RSS.png | Bin 0 -> 1769 bytes wayland/democompositor/images/Icon_StocQt.png | Bin 0 -> 1639 bytes wayland/democompositor/qml/MyButton.qml | 2 -- wayland/democompositor/qml/Screen.qml | 8 ++++---- 7 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 wayland/democompositor/images/Icon_Clocks.png create mode 100644 wayland/democompositor/images/Icon_Maps.png create mode 100644 wayland/democompositor/images/Icon_RSS.png create mode 100644 wayland/democompositor/images/Icon_StocQt.png diff --git a/wayland/democompositor/democompositor.qrc b/wayland/democompositor/democompositor.qrc index e4fcc75..940f04e 100644 --- a/wayland/democompositor/democompositor.qrc +++ b/wayland/democompositor/democompositor.qrc @@ -6,15 +6,15 @@ qml/MyButton.qml qml/LaunchButton.qml qml/TimedButton.qml - images/icon1.png - images/icon2.png - images/icon3.png - images/icon4.png images/quit.png images/greendot.png images/reddot.png images/graydot.png images/graydots.png images/greendots.png + images/Icon_Clocks.png + images/Icon_Maps.png + images/Icon_RSS.png + images/Icon_StocQt.png diff --git a/wayland/democompositor/images/Icon_Clocks.png b/wayland/democompositor/images/Icon_Clocks.png new file mode 100644 index 0000000..0ca1955 Binary files /dev/null and b/wayland/democompositor/images/Icon_Clocks.png differ diff --git a/wayland/democompositor/images/Icon_Maps.png b/wayland/democompositor/images/Icon_Maps.png new file mode 100644 index 0000000..fac0dc9 Binary files /dev/null and b/wayland/democompositor/images/Icon_Maps.png differ diff --git a/wayland/democompositor/images/Icon_RSS.png b/wayland/democompositor/images/Icon_RSS.png new file mode 100644 index 0000000..54ada4f Binary files /dev/null and b/wayland/democompositor/images/Icon_RSS.png differ diff --git a/wayland/democompositor/images/Icon_StocQt.png b/wayland/democompositor/images/Icon_StocQt.png new file mode 100644 index 0000000..d12aec1 Binary files /dev/null and b/wayland/democompositor/images/Icon_StocQt.png differ diff --git a/wayland/democompositor/qml/MyButton.qml b/wayland/democompositor/qml/MyButton.qml index c8397a6..30d7236 100644 --- a/wayland/democompositor/qml/MyButton.qml +++ b/wayland/democompositor/qml/MyButton.qml @@ -118,8 +118,6 @@ Item { rect.anchors.right = parent.right parent.longPressed = false } - onEntered: console.log("Enter: " + buttonText.text) - onExited: console.log("Exit: " + buttonText.text) drag.target: rect drag.threshold: 5 drag.axis: Drag.XAxis diff --git a/wayland/democompositor/qml/Screen.qml b/wayland/democompositor/qml/Screen.qml index 2064480..48abd19 100644 --- a/wayland/democompositor/qml/Screen.qml +++ b/wayland/democompositor/qml/Screen.qml @@ -246,7 +246,7 @@ WaylandOutput { textColor: textCol text.text: "Clocks" executable: "./clocks" - icon.source: "qrc:/images/icon1.png" + icon.source: "qrc:/images/Icon_Clocks.png" } LaunchButton { @@ -257,7 +257,7 @@ WaylandOutput { textColor: textCol text.text: "RSS News" executable: "./rssnews" - icon.source: "qrc:/images/icon2.png" + icon.source: "qrc:/images/Icon_RSS.png" } LaunchButton { height: 60 @@ -267,7 +267,7 @@ WaylandOutput { textColor: textCol text.text: "StoQt" executable: "./stocqt" - icon.source: "qrc:/images/icon3.png" + icon.source: "qrc:/images/Icon_StocQt.png" } LaunchButton { height: 60 @@ -277,7 +277,7 @@ WaylandOutput { textColor: textCol text.text: "Maps" executable: "./qml_location_mapviewer" - icon.source: "qrc:/images/icon4.png" + icon.source: "qrc:/images/Icon_Maps.png" } TimedButton { -- cgit v1.2.3 From 99bb7b69b67bcb6b1aea37a74409883412a00ac0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 11 Mar 2016 10:15:59 +0200 Subject: democompositor: make demo deployable Change-Id: Ief1e7f2a46a4f873b3328d9616e30b50bfaad2f1 Reviewed-by: Kimmo Ollila --- wayland/democompositor/democompositor.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wayland/democompositor/democompositor.pro b/wayland/democompositor/democompositor.pro index f3e31de..99b6f93 100644 --- a/wayland/democompositor/democompositor.pro +++ b/wayland/democompositor/democompositor.pro @@ -17,3 +17,5 @@ RESOURCES += democompositor.qrc HEADERS += \ processlauncher.h +INSTALLS += target +target.path = /data/user/$$TARGET -- cgit v1.2.3 From b263ce2817f4f1081ca65b240326e4fb5c8bd160 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 11 Mar 2016 12:42:10 +0200 Subject: Exclude planets demo on emulator Change-Id: I2f260c5ee8dadb466d7545ee37572a05191c0e54 Task-number: QTEE-1084 Reviewed-by: Rainer Keller --- basicsuite/demos.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml index 7052f5a..8ab8f8d 100644 --- a/basicsuite/demos.xml +++ b/basicsuite/demos.xml @@ -15,7 +15,7 @@ Demo can be used to take photos which are saved in the /data/images/ directory. - + The Planets example showcases Qt Canvas 3D. This demo combines WebGL code and three.js with QML and Qt Quick Controls. -- cgit v1.2.3 From 1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 10 Mar 2016 10:10:02 +0100 Subject: Doc: Language fixes for the demo descriptions - Replace mention of 'Enterprise Embedded' -> Qt DC - No need to mention 'Qt Quick 2.0' as a new feature anymore. Change-Id: Iefe871b68afee70d950703a2befb77f26a63f761 Reviewed-by: Leena Miettinen Reviewed-by: Samuli Piippo --- basicsuite/demos.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/basicsuite/demos.xml b/basicsuite/demos.xml index 8ab8f8d..690d1ee 100644 --- a/basicsuite/demos.xml +++ b/basicsuite/demos.xml @@ -43,15 +43,15 @@ The Flat Style Gallery example showcases the Qt Quick Controls. This demo combin -Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick 2. +Shows how to make a 3D surface plot, displaying three layers from three different height map images using Surface3D with Qt Quick. -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. +This example shows the Qt Quick ShaderEffect type and the Qt Graphical Effects module. Qt Quick 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. +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. @@ -65,15 +65,15 @@ It can play content either from a file or a network source, both videos and musi -The Qt5 Cinematic Experience is a demo by "QUIt Coding". +The Qt 5 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. +The demo shows off a number features of Qt Quick. 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. +This example demonstrates the use of Qt WebEngine with Qt Quick. Demo can be used to browse the internet (working network connection required) or run the offline web page demos. @@ -83,7 +83,7 @@ Demo can be used to browse the internet (working network connection required) or 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. +Qt for Device Creation 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. -- cgit v1.2.3