diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-13 17:50:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-13 17:50:56 +0200 |
| commit | 067e46c2b3371b7b4f952276ddcfc3e5af0d9551 (patch) | |
| tree | e36723270bea6b2a84db30b605bf208a9e3b6fcd /examples/webenginewidgets/videoplayer/main.cpp | |
| parent | 052e79299f4ada27eacc89ab36ddafda2e91a4db (diff) | |
| parent | ee5070f95be237b0ced7e53c5ce7ffde68e57c99 (diff) | |
Merge branch '5.10' into dev
Change-Id: I3a411e4019a5ec2f7d1a967b62a00ad7cf92f6f4
Diffstat (limited to 'examples/webenginewidgets/videoplayer/main.cpp')
| -rw-r--r-- | examples/webenginewidgets/videoplayer/main.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/examples/webenginewidgets/videoplayer/main.cpp b/examples/webenginewidgets/videoplayer/main.cpp index fcddd988e..f62518274 100644 --- a/examples/webenginewidgets/videoplayer/main.cpp +++ b/examples/webenginewidgets/videoplayer/main.cpp @@ -6,7 +6,17 @@ ** 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 |