diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-17 19:22:06 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-18 10:35:33 +0000 |
| commit | 47bd9af4e800ddd34e35e98e21de1567bf995d44 (patch) | |
| tree | a4bdf68ab09d7e0d06cf0ffd5bf66cdb083cb45e /basicsuite/camera/FocusControl.qml | |
| parent | bf1c4e2a416718f2e967ad03403fc1ada9a77e81 (diff) | |
Update license headers & remove obsolete strings5.6
- Update Copyright year and holder, unify license text formatting
- Update BSD, LGPL licenses for files originating from Qt
repositories
- Remove strings 'Digia' and 'Enterprise Embedded' from examples
- Update all license headers to commercial+BSD
(Cherry-picked from commits:
c5f8197bd3a4fef592f6b78e2e2b1dba17bd8d99
307b6bec8b73f780a14b13f8dccf0f2cb79bc63c
a6d8f7ce79fb5c17e706f25daf4dda4d97b5323e)
Change-Id: I47096d55a9f7c6cac2136a8594faa6af8811412e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'basicsuite/camera/FocusControl.qml')
| -rw-r--r-- | basicsuite/camera/FocusControl.qml | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/basicsuite/camera/FocusControl.qml b/basicsuite/camera/FocusControl.qml index 8191b7c..68c4642 100644 --- a/basicsuite/camera/FocusControl.qml +++ b/basicsuite/camera/FocusControl.qml @@ -1,13 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: For any questions to Digia, please use the contact form at -** http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the examples of the Qt Enterprise Embedded. +** 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 @@ -18,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. ** ** |