diff options
Diffstat (limited to 'src/doc/src/declarative/extending-tutorial.qdoc')
| -rw-r--r-- | src/doc/src/declarative/extending-tutorial.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/doc/src/declarative/extending-tutorial.qdoc b/src/doc/src/declarative/extending-tutorial.qdoc index b425c60e..98894fb5 100644 --- a/src/doc/src/declarative/extending-tutorial.qdoc +++ b/src/doc/src/declarative/extending-tutorial.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** 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. Please review the following information to ensure +** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements ** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ @@ -443,7 +443,7 @@ the project and then load the QML file in the \l {QML Viewer}: qmlviewer app.qml \endcode -(On Mac OS X, you can launch the "QMLViewer" application instead.) +(On OS X, you can launch the "QMLViewer" application instead.) Notice the "import Charts 1.0" statement has disappeared from \c app.qml. This is because the \c qmldir file is in the same directory as \c app.qml: this is equivalent to |