summaryrefslogtreecommitdiffstats
path: root/tradeshow
diff options
context:
space:
mode:
authorKari Hormi <kari.hormi@qt.io>2016-06-07 11:32:37 +0300
committerKari Hormi <kari.hormi@qt.io>2016-06-07 09:27:21 +0000
commita6d8f7ce79fb5c17e706f25daf4dda4d97b5323e (patch)
treefaae7c8e6ebb36c53e2432fd706455c5912bae7e /tradeshow
parent7a0d5bab03d36d981f4848dad39c07f1e4ff25a7 (diff)
Update license headers
- Update all license headers to commercial+BSD Change-Id: I7dbf9d967cde7dfe21bef255ea63652b42fccb71 Reviewed-by: Kalle Viironen <kalle.viironen@theqtcompany.com>
Diffstat (limited to 'tradeshow')
-rw-r--r--tradeshow/enterprise-kinectdatavis/Noise.qml71
-rwxr-xr-xtradeshow/enterprise-kinectdatavis/deploy.sh50
-rwxr-xr-xtradeshow/enterprise-kinectdatavis/runHere.sh50
3 files changed, 149 insertions, 22 deletions
diff --git a/tradeshow/enterprise-kinectdatavis/Noise.qml b/tradeshow/enterprise-kinectdatavis/Noise.qml
index eace7c2..87806b9 100644
--- a/tradeshow/enterprise-kinectdatavis/Noise.qml
+++ b/tradeshow/enterprise-kinectdatavis/Noise.qml
@@ -1,25 +1,52 @@
-/*
-Copyright (C) 2011 by Ashima Arts (Simplex noise)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of Qt for Device Creation.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, 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 The Qt Company Ltd 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.1
ShaderEffect {
diff --git a/tradeshow/enterprise-kinectdatavis/deploy.sh b/tradeshow/enterprise-kinectdatavis/deploy.sh
index b825add..b2f5e1f 100755
--- a/tradeshow/enterprise-kinectdatavis/deploy.sh
+++ b/tradeshow/enterprise-kinectdatavis/deploy.sh
@@ -1,3 +1,53 @@
+#/****************************************************************************
+#**
+#** Copyright (C) 2016 The Qt Company Ltd.
+#** Contact: https://www.qt.io/licensing/
+#**
+#** This file is part of the examples of Qt for Device Creation.
+#**
+#** $QT_BEGIN_LICENSE:BSD$
+#** Commercial License Usage
+#** Licensees holding valid commercial Qt licenses may use this file in
+#** accordance with the commercial license agreement provided with the
+#** Software or, alternatively, in accordance with the terms contained in
+#** a written agreement between you and The Qt Company. For licensing terms
+#** and conditions see https://www.qt.io/terms-conditions. For further
+#** information use the contact form at https://www.qt.io/contact-us.
+#**
+#** BSD License Usage
+#** Alternatively, 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 The Qt Company Ltd 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$
+#**
+#****************************************************************************/
+
#!/bin/sh
B2QT_DEPLOYPATH=/data/user/qt/enterprise-kinectdatavis
diff --git a/tradeshow/enterprise-kinectdatavis/runHere.sh b/tradeshow/enterprise-kinectdatavis/runHere.sh
index d6c1a21..59edf61 100755
--- a/tradeshow/enterprise-kinectdatavis/runHere.sh
+++ b/tradeshow/enterprise-kinectdatavis/runHere.sh
@@ -1,3 +1,53 @@
+#/****************************************************************************
+#**
+#** Copyright (C) 2016 The Qt Company Ltd.
+#** Contact: https://www.qt.io/licensing/
+#**
+#** This file is part of the examples of Qt for Device Creation.
+#**
+#** $QT_BEGIN_LICENSE:BSD$
+#** Commercial License Usage
+#** Licensees holding valid commercial Qt licenses may use this file in
+#** accordance with the commercial license agreement provided with the
+#** Software or, alternatively, in accordance with the terms contained in
+#** a written agreement between you and The Qt Company. For licensing terms
+#** and conditions see https://www.qt.io/terms-conditions. For further
+#** information use the contact form at https://www.qt.io/contact-us.
+#**
+#** BSD License Usage
+#** Alternatively, 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 The Qt Company Ltd 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$
+#**
+#****************************************************************************/
+
#!/bin/sh
qmlscene -I . main.qml