diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:55 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-11-20 13:48:55 +0100 |
commit | ef10b82a28114718591bcdabec031ce05caacf37 (patch) | |
tree | abed438a028a272446d947387a40b8127e4eaf28 /examples/quick/demos/stocqt/content/stocqt.js | |
parent | 85fc49612816dcfc81c9dc265b146b0b90b0f184 (diff) | |
parent | 131a7e3a544a90035dcab5e1aa6aff509395e155 (diff) |
Merge 5.10 into 5.10.0
Change-Id: I68e1137c57cdb4c585dd44b0528744bde7df047a
Diffstat (limited to 'examples/quick/demos/stocqt/content/stocqt.js')
-rw-r--r-- | examples/quick/demos/stocqt/content/stocqt.js | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/quick/demos/stocqt/content/stocqt.js b/examples/quick/demos/stocqt/content/stocqt.js index cc8ad7a9ef..6bcc7e3404 100644 --- a/examples/quick/demos/stocqt/content/stocqt.js +++ b/examples/quick/demos/stocqt/content/stocqt.js @@ -1,12 +1,22 @@ /**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** 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 |