aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml/referenceexamples/adding/main.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-10-24 12:32:39 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-10-24 12:32:39 +0000
commit1aa91f8b0b140c417c6e97dfd22fa498d31bceb6 (patch)
tree714b9c79ca84cf9bda9912ea723cd925f0e8f4c9 /examples/qml/referenceexamples/adding/main.cpp
parent83c8f8d90a960965c1f166c4421f514f4236212a (diff)
parent15dd1b7883f5dbe66266aeb588381f85f3532ab9 (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'examples/qml/referenceexamples/adding/main.cpp')
-rw-r--r--examples/qml/referenceexamples/adding/main.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/qml/referenceexamples/adding/main.cpp b/examples/qml/referenceexamples/adding/main.cpp
index 74a4a39a9a..5c3c891130 100644
--- a/examples/qml/referenceexamples/adding/main.cpp
+++ b/examples/qml/referenceexamples/adding/main.cpp
@@ -1,12 +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 the Qt Toolkit.
**
** $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