From 307b6bec8b73f780a14b13f8dccf0f2cb79bc63c Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 26 Apr 2016 12:44:45 +0200 Subject: Update license headers - Update Copyright year and holder, unify license text formatting - Update BSD, LGPL licenses for files originating from Qt repositories Change-Id: Id77f62f754c3bb29bb4b1c816e3f984a087ee87e Reviewed-by: Samuli Piippo --- .../multipointtouch/content/ParticleFlame.qml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'tradeshow/multipointtouch/content') diff --git a/tradeshow/multipointtouch/content/ParticleFlame.qml b/tradeshow/multipointtouch/content/ParticleFlame.qml index b8ebb90..96779f6 100644 --- a/tradeshow/multipointtouch/content/ParticleFlame.qml +++ b/tradeshow/multipointtouch/content/ParticleFlame.qml @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of Qt for Device Creation. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 @@ -17,8 +27,8 @@ ** 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 +** * 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. ** ** -- cgit v1.2.3