diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:40:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-27 05:43:09 +0200 |
| commit | 732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch) | |
| tree | ccbc4894addfbdd10ec02bae3b30b238e0455785 /examples/multimedia/declarative-radio/view.qml | |
| parent | fa8e1e71bb17efe2549d9e81768f19c065065fce (diff) | |
| parent | 08db8a408829cb3bbd204e71dd8d5616e7d21d3d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
examples/multimedia/declarative-radio/view.qml
src/plugins/qnx/mediaplayer/mmrenderermediaplayercontrol.h
Change-Id: I97b507878b6de04ec38ddd13530e58b8f72390e4
Diffstat (limited to 'examples/multimedia/declarative-radio/view.qml')
| -rw-r--r-- | examples/multimedia/declarative-radio/view.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/examples/multimedia/declarative-radio/view.qml b/examples/multimedia/declarative-radio/view.qml index 4bc3fbc4a..ab173a737 100644 --- a/examples/multimedia/declarative-radio/view.qml +++ b/examples/multimedia/declarative-radio/view.qml @@ -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 |