diff options
author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-05 12:16:28 +0300 |
---|---|---|
committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-05 12:16:36 +0300 |
commit | 3e8d4a6e8d1cf557d923c130bb270a63321a1f53 (patch) | |
tree | 4733cf488ed39cc779159395982d7e335111751e | |
parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) | |
parent | ec601d35edd2a3fcc0553db983bdd2a4f4439cdf (diff) |
Merge branch 'dev' into stable
* dev:
Fix qt5-cinematicdemo on Qt 5.3
Check for multimedia before building camera and qteverywhere demos
The little neato multitocuh flame thing to play with
Change-Id: I42832d3b96fac48d6561fc9f7b1c8cbd26d2fe68
-rw-r--r-- | basicsuite/basicsuite.pro | 7 | ||||
-rw-r--r-- | basicsuite/qt5-cinematicdemo/content/SettingsView.qml | 4 | ||||
-rw-r--r-- | basicsuite/qt5-cinematicdemo/content/Switch.qml | 8 | ||||
-rw-r--r-- | tradeshow/multipointtouch/content/ParticleFlame.qml | 70 | ||||
-rw-r--r-- | tradeshow/multipointtouch/content/blur-circle.png | bin | 0 -> 4279 bytes | |||
-rw-r--r-- | tradeshow/multipointtouch/content/blur-circle3.png | bin | 0 -> 5148 bytes | |||
-rw-r--r-- | tradeshow/multipointtouch/description.txt | 5 | ||||
-rw-r--r-- | tradeshow/multipointtouch/main.qml | 95 | ||||
-rw-r--r-- | tradeshow/multipointtouch/preview_l.jpg | bin | 0 -> 6881 bytes | |||
-rw-r--r-- | tradeshow/multipointtouch/title.txt | 1 |
10 files changed, 182 insertions, 8 deletions
diff --git a/basicsuite/basicsuite.pro b/basicsuite/basicsuite.pro index 54a59f2..c098e1f 100644 --- a/basicsuite/basicsuite.pro +++ b/basicsuite/basicsuite.pro @@ -1,5 +1,8 @@ TEMPLATE = subdirs SUBDIRS += \ - qt5-everywhere \ - camera \ sensorexplorer + +qtHaveModule(multimedia) { + SUBDIRS += qt5-everywhere \ + camera +} diff --git a/basicsuite/qt5-cinematicdemo/content/SettingsView.qml b/basicsuite/qt5-cinematicdemo/content/SettingsView.qml index 7944803..4499a8c 100644 --- a/basicsuite/qt5-cinematicdemo/content/SettingsView.qml +++ b/basicsuite/qt5-cinematicdemo/content/SettingsView.qml @@ -127,8 +127,8 @@ Item { Switch { text: "Do you l-o-v-e colors?" checked: settings.showColors - onText: "Yes" - offText: "No!" + textOn: "Yes" + textOff: "No!" onCheckedChanged: { settings.showColors = checked; } diff --git a/basicsuite/qt5-cinematicdemo/content/Switch.qml b/basicsuite/qt5-cinematicdemo/content/Switch.qml index 967c03f..0124658 100644 --- a/basicsuite/qt5-cinematicdemo/content/Switch.qml +++ b/basicsuite/qt5-cinematicdemo/content/Switch.qml @@ -6,8 +6,8 @@ Item { property alias text: textItem.text property bool checked: false - property string onText: "On" - property string offText: "Off" + property string textOn: "On" + property string textOff: "Off" QtObject { id: priv @@ -120,7 +120,7 @@ Item { color: "#000000" font.pixelSize: 18 font.bold: true - text: onText + text: textOn } Text { anchors.verticalCenter: parent.verticalCenter @@ -129,7 +129,7 @@ Item { color: "#ffffff" font.pixelSize: 18 font.bold: true - text: offText + text: textOff } Image { diff --git a/tradeshow/multipointtouch/content/ParticleFlame.qml b/tradeshow/multipointtouch/content/ParticleFlame.qml new file mode 100644 index 0000000..b8ebb90 --- /dev/null +++ b/tradeshow/multipointtouch/content/ParticleFlame.qml @@ -0,0 +1,70 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * 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 +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtQuick.Particles 2.0 + +ParticleSystem { + anchors.fill: parent + + property alias emitterX: emitter.x + property alias emitterY: emitter.y + + property alias color: img.color + property alias emitting: emitter.enabled + ImageParticle { + id: img + source: "blur-circle.png" + colorVariation: 0.1 + color: "#ff521d" + alpha: 0 + } + Emitter { + id: emitter + velocityFromMovement: 10 + emitRate: 80 + lifeSpan: 1500 + velocity: PointDirection{ y: -90; yVariation: 50; } + acceleration: PointDirection{ xVariation: 100; yVariation: 90; } + size: 51 + sizeVariation: 53 + endSize: 64 + } +} diff --git a/tradeshow/multipointtouch/content/blur-circle.png b/tradeshow/multipointtouch/content/blur-circle.png Binary files differnew file mode 100644 index 0000000..1b03cd0 --- /dev/null +++ b/tradeshow/multipointtouch/content/blur-circle.png diff --git a/tradeshow/multipointtouch/content/blur-circle3.png b/tradeshow/multipointtouch/content/blur-circle3.png Binary files differnew file mode 100644 index 0000000..dbc39cb --- /dev/null +++ b/tradeshow/multipointtouch/content/blur-circle3.png diff --git a/tradeshow/multipointtouch/description.txt b/tradeshow/multipointtouch/description.txt new file mode 100644 index 0000000..a83514e --- /dev/null +++ b/tradeshow/multipointtouch/description.txt @@ -0,0 +1,5 @@ +On touch screens, this demo visualizes up to five simultaneous touch points. + +The graphics are created using the Qt Quick Particles module. + + diff --git a/tradeshow/multipointtouch/main.qml b/tradeshow/multipointtouch/main.qml new file mode 100644 index 0000000..c397791 --- /dev/null +++ b/tradeshow/multipointtouch/main.qml @@ -0,0 +1,95 @@ +/**************************************************************************** +** +** Copyright (C) 2013 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. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * 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 +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +import QtQuick 2.0 +import "content" + +Rectangle { + width: 360 + height: 480 + color: "black" + +//! [0] + MultiPointTouchArea { + anchors.fill: parent + minimumTouchPoints: 1 + maximumTouchPoints: 5 + touchPoints: [ + TouchPoint { id: touch1 }, + TouchPoint { id: touch2 }, + TouchPoint { id: touch11 }, + TouchPoint { id: touch21 }, + TouchPoint { id: touch31 } + ] + } +//! [0] + +//! [1] + ParticleFlame { + color: "red" + emitterX: touch1.x + emitterY: touch1.y + emitting: touch1.pressed + } +//! [1] + ParticleFlame { + color: "green" + emitterX: touch2.x + emitterY: touch2.y + emitting: touch2.pressed + } + ParticleFlame { + color: "yellow" + emitterX: touch11.x + emitterY: touch11.y + emitting: touch11.pressed + } + ParticleFlame { + color: "blue" + emitterX: touch21.x + emitterY: touch21.y + emitting: touch21.pressed + } + ParticleFlame { + color: "violet" + emitterX: touch31.x + emitterY: touch31.y + emitting: touch31.pressed + } +} diff --git a/tradeshow/multipointtouch/preview_l.jpg b/tradeshow/multipointtouch/preview_l.jpg Binary files differnew file mode 100644 index 0000000..12e113f --- /dev/null +++ b/tradeshow/multipointtouch/preview_l.jpg diff --git a/tradeshow/multipointtouch/title.txt b/tradeshow/multipointtouch/title.txt new file mode 100644 index 0000000..7e40a28 --- /dev/null +++ b/tradeshow/multipointtouch/title.txt @@ -0,0 +1 @@ +Multipoint Touch |