summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative/tutorial2.qdoc
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-02-19 10:48:45 (GMT)
committeraxis <qt-info@nokia.com>2010-02-19 10:48:45 (GMT)
commit1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch)
tree8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /doc/src/declarative/tutorial2.qdoc
parent0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff)
parentade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff)
downloadQt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip
Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz
Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts: qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'doc/src/declarative/tutorial2.qdoc')
-rw-r--r--doc/src/declarative/tutorial2.qdoc41
1 files changed, 41 insertions, 0 deletions
diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc
index dd0d428..3e92e37 100644
--- a/doc/src/declarative/tutorial2.qdoc
+++ b/doc/src/declarative/tutorial2.qdoc
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** 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 test suite 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 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
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** 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.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.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
/*!
\page tutorial2.html
\title Tutorial 2 - QML Component