diff options
author | Iikka Eklund <iikka.eklund@qt.io> | 2016-08-29 10:25:42 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@qt.io> | 2016-08-29 10:03:29 +0000 |
commit | 8d975bc9273d58d54b6bf461078c481af1b201dd (patch) | |
tree | f2ab218bd509afe19b50ab54c2e6ba09c3c853b3 /examples/helloworld-qt | |
parent | 6b6b4069b3f92cd6288718945c4bdd414e1ca0ed (diff) | |
download | qbs-8d975bc9273d58d54b6bf461078c481af1b201dd.tar.gz |
Update license headers
Patch-set 2 includes *.cpp *.c
Every source file needs to have up-to-date license
headers in order to pass ci.
Change-Id: Ie6e493097af6f7dd6a8adff170eb856f496e689e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'examples/helloworld-qt')
-rw-r--r-- | examples/helloworld-qt/main.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/examples/helloworld-qt/main.cpp b/examples/helloworld-qt/main.cpp index d912b1c6d..1a128d4c8 100644 --- a/examples/helloworld-qt/main.cpp +++ b/examples/helloworld-qt/main.cpp @@ -1,11 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the examples of Qbs. +** This file is part 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$ +** ****************************************************************************/ #include <QCoreApplication> |