diff options
Diffstat (limited to 'examples/mediaplayer-widgets-static')
-rw-r--r-- | examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc | 24 | ||||
-rw-r--r-- | examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp | 18 |
2 files changed, 29 insertions, 13 deletions
diff --git a/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc b/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc index 5c4e99a..f06db24 100644 --- a/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc +++ b/examples/mediaplayer-widgets-static/doc/src/mediaplayer-widgets-static.qdoc @@ -1,23 +1,29 @@ -/****************************************************************************** +/**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtScxml module. -** -** $QT_BEGIN_LICENSE:COMM$ +** This file is part of the documentation of the Qt Toolkit. ** +** $QT_BEGIN_LICENSE:FDL$ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** -******************************************************************************/ +****************************************************************************/ /*! \example mediaplayer-widgets-static diff --git a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp b/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp index 6f3c657..65b8cb0 100644 --- a/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp +++ b/examples/mediaplayer-widgets-static/mediaplayer-widgets-static.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the QtScxml module 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 |