summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlconnection_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-30 06:33:48 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-30 06:33:48 (GMT)
commit4aaacb65d75ed58d5b69204f5bd53dc0acee1644 (patch)
treefae3869d7e4a56ac2d77dfbfae15c18316359d0a /src/declarative/util/qmlconnection_p.h
parent9c8774e4aff4e21eb7dc4b98ce525e0b1a8285f6 (diff)
parentfed23e1171d12c4b069652acacc2d718c9691c12 (diff)
downloadQt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.zip
Qt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.tar.gz
Qt-4aaacb65d75ed58d5b69204f5bd53dc0acee1644.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp
Diffstat (limited to 'src/declarative/util/qmlconnection_p.h')
-rw-r--r--src/declarative/util/qmlconnection_p.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/declarative/util/qmlconnection_p.h b/src/declarative/util/qmlconnection_p.h
index 3d69c6f..7a69771 100644
--- a/src/declarative/util/qmlconnection_p.h
+++ b/src/declarative/util/qmlconnection_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$
**
****************************************************************************/