diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2008-12-01 15:08:14 +0100 |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2008-12-01 15:08:14 +0100 |
| commit | 90fcdd2349f231a4347582008b246d55cb0fb4d5 (patch) | |
| tree | f788965a85b9a56b2c56b29de3f2129ce7bea44a /mediaplayer | |
| parent | 14339f4abd34b4f08d9f3af039c505a4667887bd (diff) | |
Update license headers.
Diffstat (limited to 'mediaplayer')
| -rw-r--r-- | mediaplayer/mediaplayer.cpp | 18 | ||||
| -rw-r--r-- | mediaplayer/mediaplayer.h | 18 |
2 files changed, 30 insertions, 6 deletions
diff --git a/mediaplayer/mediaplayer.cpp b/mediaplayer/mediaplayer.cpp index a280293..c9642a9 100644 --- a/mediaplayer/mediaplayer.cpp +++ b/mediaplayer/mediaplayer.cpp @@ -3,11 +3,23 @@ ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the Graphics Dojo project on Trolltech Labs. ** -** $TROLLTECH_DUAL_LICENSE$ +** This file may be used under the terms of the GNU General Public +** License version 2.0 or 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of +** this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. ** -***************************************************************************/ +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #include <QtGui> diff --git a/mediaplayer/mediaplayer.h b/mediaplayer/mediaplayer.h index 3797079..bb2f94b 100644 --- a/mediaplayer/mediaplayer.h +++ b/mediaplayer/mediaplayer.h @@ -3,11 +3,23 @@ ** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the Graphics Dojo project on Trolltech Labs. ** -** $TROLLTECH_DUAL_LICENSE$ +** This file may be used under the terms of the GNU General Public +** License version 2.0 or 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of +** this file. Please review the following information to ensure GNU +** General Public Licensing requirements will be met: +** http://www.fsf.org/licensing/licenses/info/GPLv2.html and +** http://www.gnu.org/copyleft/gpl.html. ** -***************************************************************************/ +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ #ifndef MEDIALAYER_H #define MEDIAPLAYER_H |