diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-03 11:26:02 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-03 13:36:27 +0000 |
| commit | f4c9507918ef223121b0b8f04eb1136367cf26b3 (patch) | |
| tree | 17b6d9cb0ae99a292c56ea182ecd29765524b5c6 /examples/helloworld-qt | |
| parent | d3082bc340ac8d18c144946bc8d229059c9123ba (diff) | |
Update the license headers of examples
Change-Id: I29c6501e8afaa839beea94a44c03870ddd287367
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'examples/helloworld-qt')
| -rw-r--r-- | examples/helloworld-qt/hello.qbs | 23 | ||||
| -rw-r--r-- | examples/helloworld-qt/main.cpp | 4 |
2 files changed, 20 insertions, 7 deletions
diff --git a/examples/helloworld-qt/hello.qbs b/examples/helloworld-qt/hello.qbs index de58d3a86..4c6e070af 100644 --- a/examples/helloworld-qt/hello.qbs +++ b/examples/helloworld-qt/hello.qbs @@ -1,11 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of Qbs. ** -** You may use this file under the terms of the BSD license as follows: +** $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 @@ -16,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 The Qt Company Ltd 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. ** ** @@ -33,6 +44,8 @@ ** (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 qbs diff --git a/examples/helloworld-qt/main.cpp b/examples/helloworld-qt/main.cpp index 1a128d4c8..217fc12d0 100644 --- a/examples/helloworld-qt/main.cpp +++ b/examples/helloworld-qt/main.cpp @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of Qbs. +** This file is part of the examples of Qbs. ** ** $QT_BEGIN_LICENSE:BSD$ ** Commercial License Usage |