summaryrefslogtreecommitdiffstats
path: root/examples/tutorial/CodeSection.qml
diff options
context:
space:
mode:
authorTeemu Kaukoranta <[email protected]>2013-05-21 08:58:42 +0300
committerSergio Ahumada <[email protected]>2013-05-23 11:18:12 +0200
commit3e80b5966720862e37ef10a25dd911eb3e8f75c5 (patch)
treea0289e7cd0aabe9d158b3928a85a67b76852f513 /examples/tutorial/CodeSection.qml
parent9ce3750d81f91d762dbefca9139c5d5bc4a168fe (diff)
Fixed licenses
Updated licenses using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Reviewed-by: Janne Anttila <[email protected]>, Sergio Ahumada <[email protected]> Change-Id: Ic7a632fdaa54433c3267f9423bc61f77fe3149ae Reviewed-by: Sergio Ahumada <[email protected]> Reviewed-by: Janne Anttila <[email protected]>
Diffstat (limited to 'examples/tutorial/CodeSection.qml')
-rw-r--r--examples/tutorial/CodeSection.qml42
1 files changed, 21 insertions, 21 deletions
diff --git a/examples/tutorial/CodeSection.qml b/examples/tutorial/CodeSection.qml
index 4d88953..a62ba98 100644
--- a/examples/tutorial/CodeSection.qml
+++ b/examples/tutorial/CodeSection.qml
@@ -6,33 +6,33 @@
** This file is part of the QML Presentation System.
**
** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
** GNU Lesser General Public License Usage
-** 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.
+** 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, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** 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.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
+** 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.
**
**
** $QT_END_LICENSE$