diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-30 05:34:45 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-30 05:34:45 (GMT) |
| commit | 9bbc155f0efe4bc873d7da4ac4ad844a6814c4e7 (patch) | |
| tree | 175e5d288bc6ffa921733bcf9b82836466ac7ff8 /src/declarative/fx/qfxpath_p.h | |
| parent | fe2d8f1e7560c441694ef3650ba41c3a5298a44f (diff) | |
| parent | 46eec6d54bad7a686b3dd5cd6e4aa8577d38740d (diff) | |
| download | Qt-9bbc155f0efe4bc873d7da4ac4ad844a6814c4e7.zip Qt-9bbc155f0efe4bc873d7da4ac4ad844a6814c4e7.tar.gz Qt-9bbc155f0efe4bc873d7da4ac4ad844a6814c4e7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/dial/main.cpp
Diffstat (limited to 'src/declarative/fx/qfxpath_p.h')
| -rw-r--r-- | src/declarative/fx/qfxpath_p.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/declarative/fx/qfxpath_p.h b/src/declarative/fx/qfxpath_p.h index d4a419a..1b13e80 100644 --- a/src/declarative/fx/qfxpath_p.h +++ b/src/declarative/fx/qfxpath_p.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$ ** ****************************************************************************/ |