diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 15:08:36 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-29 15:08:36 +0000 |
commit | a6ca622baf9e4f6afee783fd87a6d3f245efd278 (patch) | |
tree | a04c866cdeef6a7fa48583d5f4bcf664e5088382 /examples/webenginewidgets/videoplayer/fullscreenwindow.cpp | |
parent | 24b5f01726351c6e6e925bfaf4c7575f469ad0d0 (diff) | |
parent | fa12e9c1c3634696cf3e0754ab9c374456945efc (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'examples/webenginewidgets/videoplayer/fullscreenwindow.cpp')
-rw-r--r-- | examples/webenginewidgets/videoplayer/fullscreenwindow.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/examples/webenginewidgets/videoplayer/fullscreenwindow.cpp b/examples/webenginewidgets/videoplayer/fullscreenwindow.cpp index df28839a2..fbc899d83 100644 --- a/examples/webenginewidgets/videoplayer/fullscreenwindow.cpp +++ b/examples/webenginewidgets/videoplayer/fullscreenwindow.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 @@ -37,6 +47,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + #include "fullscreenwindow.h" #include "fullscreennotification.h" |