diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:59 +0100 |
| commit | 72659b4a54c5e6f9c57e5724800a69b81681dda0 (patch) | |
| tree | 9e108ab0bc1bb778ad89c67336cae4275f4858fc /examples/winextras/quickplayer/main.cpp | |
| parent | 17bdee86da84c6718fc1bbe8cedf5bdf07240837 (diff) | |
| parent | 3ad89fd9022e2010eeca7dfa2548eb149dc34fe6 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I74a06808463f12488fe19b3e9ec7d1c20ac529b4
Diffstat (limited to 'examples/winextras/quickplayer/main.cpp')
| -rw-r--r-- | examples/winextras/quickplayer/main.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/examples/winextras/quickplayer/main.cpp b/examples/winextras/quickplayer/main.cpp index 479444f..caf3a01 100644 --- a/examples/winextras/quickplayer/main.cpp +++ b/examples/winextras/quickplayer/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 |