diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-19 06:25:09 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-19 06:25:09 +0000 |
| commit | 79cadf244e8a8a6b596fb33d83a3371028a72b05 (patch) | |
| tree | fe69f366279f4ac62c402e617d4e6971fdc357e6 /doc/snippets/qmlapp/qtbinding/resources/main.qml | |
| parent | b45e1f6d8fe0a7c8a36f79ef51e02052a013ea2b (diff) | |
| parent | 0d3b07541a1f9136178fe0ab1f140375acb033e8 (diff) | |
| download | qtdoc-79cadf244e8a8a6b596fb33d83a3371028a72b05.tar.gz | |
Merge "Merge remote-tracking branch 'gerrit/dev' into 5.5" into refs/staging/5.5
Diffstat (limited to 'doc/snippets/qmlapp/qtbinding/resources/main.qml')
| -rw-r--r-- | doc/snippets/qmlapp/qtbinding/resources/main.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/snippets/qmlapp/qtbinding/resources/main.qml b/doc/snippets/qmlapp/qtbinding/resources/main.qml index 9ccf7953..43af0084 100644 --- a/doc/snippets/qmlapp/qtbinding/resources/main.qml +++ b/doc/snippets/qmlapp/qtbinding/resources/main.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 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. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** |