summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlcomponent.h
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-10-29 05:42:51 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-10-29 05:42:51 (GMT)
commit8e38aca65545b63d998249cf23cefa52728cd94d (patch)
tree836e116c8c2262fef936ceb248d04d6e694f7de1 /src/declarative/qml/qmlcomponent.h
parentfd92687cce5ae0ffb540762852f5ac9c0d327892 (diff)
downloadQt-8e38aca65545b63d998249cf23cefa52728cd94d.zip
Qt-8e38aca65545b63d998249cf23cefa52728cd94d.tar.gz
Qt-8e38aca65545b63d998249cf23cefa52728cd94d.tar.bz2
fix headers
Diffstat (limited to 'src/declarative/qml/qmlcomponent.h')
-rw-r--r--src/declarative/qml/qmlcomponent.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index a72aa4e..2aa77d3 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -1,7 +1,8 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtDeclarative module of the Qt Toolkit.
**
@@ -9,8 +10,8 @@
** 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,21 +21,20 @@
** 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 qt-sales@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/