Merge branch 'stable' into releaseQtEE_v3.0.0

* stable: (28 commits)
  webengine demo: rearrange layout to make all links visible on iMX6
  webengine demo: add predefined links to page view
  Fix webengine demo to hide home screen when adressbar is accepted
  webengine demo: disable the pageview when it's hidden
  Hide the webengine demo on the new nexus7
  Add local CSS tetrahedron example and home page to webengine demo
  Disable webengine demo on beaglebone and pi
  [launchersettings] Add boundaries for signal strength bar.
  Also deploy webengine demo local content
  Display an error message if WebGL is not supported.
  Add a simple WebEngine demo to the B2Qt basicsuite
  Exclude qtdatavis3d from android-beaglebone
  Disable autocompletion for password field
  workaround for crash on linux
  Camera demo doesn't work on new nexus just yet, exclude it
  Remove yocto version from about-b2qt demo
  remove datavis 3D from RPi launher demos
  Fix typo in came exclude
  Use consistent title naming
  Remove non functional demos from i.MX6 SABRE SD launcher demo set
  ...

Change-Id: Ib08aba9f746c6f233090d79c38243caa657bf9be

1 files changed, 95 insertions, 0 deletions

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
+    }
+}