summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/eglconvenience/qeglconvenience.h
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-10-28 12:34:55 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-10-28 12:40:04 (GMT)
commit8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572 (patch)
tree8c9717f0a6437d544a5ca0153aa65f86fa487d2b /src/plugins/platforms/eglconvenience/qeglconvenience.h
parentfee7ca62b6611f4a662fbb4541c83e280be08aba (diff)
downloadQt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.zip
Qt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.tar.gz
Qt-8b7dad6c1290c3c5f9ce35ea9d13a4b7e6398572.tar.bz2
Fix the license in files for Lighthouse
Diffstat (limited to 'src/plugins/platforms/eglconvenience/qeglconvenience.h')
-rw-r--r--src/plugins/platforms/eglconvenience/qeglconvenience.h35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/plugins/platforms/eglconvenience/qeglconvenience.h b/src/plugins/platforms/eglconvenience/qeglconvenience.h
index 484894b..604262b 100644
--- a/src/plugins/platforms/eglconvenience/qeglconvenience.h
+++ b/src/plugins/platforms/eglconvenience/qeglconvenience.h
@@ -1,16 +1,17 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the QtOpenVG module of the Qt Toolkit.
+** This file is part of the plugins of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** No Commercial Usage
** This file contains pre-release code and may not be distributed.
** You may use this file in accordance with the terms and conditions
-** contained in the either Technology Preview License Agreement or the
-** Beta Release License Agreement.
+** contained in the Technology Preview License Agreement accompanying
+** this package.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -20,24 +21,24 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 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 the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
+
#ifndef QEGLCONVENIENCE_H
#define QEGLCONVENIENCE_H