diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:28 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 07:15:35 +0200 |
commit | 1cb4027e0a59e1875db88b72afb5833aafbd87eb (patch) | |
tree | 35646da4972db8bff385ec4147161d133e7bf1b8 /examples/multimedia/audioengine/qml/audioengine.qml | |
parent | 82694e41b1d37e04ecc911f420ad4317220f8180 (diff) | |
parent | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (diff) | |
download | qtmultimedia-1cb4027e0a59e1875db88b72afb5833aafbd87eb.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ib509a8c90dd6c7229510a400612cc27a4957d015
Diffstat (limited to 'examples/multimedia/audioengine/qml/audioengine.qml')
-rw-r--r-- | examples/multimedia/audioengine/qml/audioengine.qml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/multimedia/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml index e6e095dff..212eb6567 100644 --- a/examples/multimedia/audioengine/qml/audioengine.qml +++ b/examples/multimedia/audioengine/qml/audioengine.qml @@ -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 |