diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-15 14:57:40 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-01-19 15:57:01 +0000 |
| commit | 397e7f48437dc57e6333c3a358ad24d3e891920d (patch) | |
| tree | 66dad73e3a9764e1c5dae2106eac127a81673460 /src/plugins/imageviewer/imageview.h | |
| parent | 1b4321279fccb458882ed0f581ce7834fd1529fa (diff) | |
Update License according to agreement with Free Qt Foundation
* Update files in src/plugins
Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer/imageview.h')
| -rw-r--r-- | src/plugins/imageviewer/imageview.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/plugins/imageviewer/imageview.h b/src/plugins/imageviewer/imageview.h index 00e266c6d0..46bf3d66b0 100644 --- a/src/plugins/imageviewer/imageview.h +++ b/src/plugins/imageviewer/imageview.h @@ -1,12 +1,24 @@ -/************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 Denis Mingulov. -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 Denis Mingulov. +** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2016 Denis Mingulov. +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator ** -** 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,10 +29,10 @@ ** 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 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. +** * 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 @@ -34,8 +46,7 @@ ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** -**************************************************************************/ - +****************************************************************************/ #ifndef IMAGEVIEW_H #define IMAGEVIEW_H |