path: root/examples/multimediawidgets/videographicsitem/videoplayer.cpp
diff options
authorLiang Qi <>2017-10-27 05:40:34 +0200
committerLiang Qi <>2017-10-27 05:43:09 +0200
commit732d9cb6848a42f5a61b2b74dece962cdfba1d31 (patch)
treeccbc4894addfbdd10ec02bae3b30b238e0455785 /examples/multimediawidgets/videographicsitem/videoplayer.cpp
parentfa8e1e71bb17efe2549d9e81768f19c065065fce (diff)
parent08db8a408829cb3bbd204e71dd8d5616e7d21d3d (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/multimediawidgets/videographicsitem/videoplayer.cpp')
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/multimediawidgets/videographicsitem/videoplayer.cpp b/examples/multimediawidgets/videographicsitem/videoplayer.cpp
index 82f784a1..995c86d3 100644
--- a/examples/multimediawidgets/videographicsitem/videoplayer.cpp
+++ b/examples/multimediawidgets/videographicsitem/videoplayer.cpp
@@ -1,12 +1,22 @@
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact:
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact:
** This file is part of the examples of the Qt Toolkit.
-** 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 For further
+** information use the contact form at
+** 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