summaryrefslogtreecommitdiffstats
path: root/doc/src/examples/teapot.qdoc
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-08-04 18:51:20 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-05 03:17:13 +0200
commitcec5d6b116be8b117c7d57638ea9430a40b2ec51 (patch)
tree3117a4521f1078c9a5b25e3454d29182aaa6973e /doc/src/examples/teapot.qdoc
parentfc6bbb2e3d2e413946ec57b7aa372ddb105d192a (diff)
Replace outdated license headers
Change-Id: Ic8eeb05bf094e6b6de92be4d713e0f25ec9677a8 Reviewed-on: http://codereview.qt.nokia.com/2612 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'doc/src/examples/teapot.qdoc')
-rw-r--r--doc/src/examples/teapot.qdoc22
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/examples/teapot.qdoc b/doc/src/examples/teapot.qdoc
index 80d10ddb..d85fca48 100644
--- a/doc/src/examples/teapot.qdoc
+++ b/doc/src/examples/teapot.qdoc
@@ -1,26 +1,26 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
** This file is part of the QtQuick3D documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License
** Alternatively, this file may be used under the terms of the GNU Free
** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of this
-** file.
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
** $QT_END_LICENSE$
**
****************************************************************************/