diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-04 10:10:37 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-04 10:11:49 +0100 |
| commit | bf7ddcb7f1b2d854b0e957bf6ec3e88372853a5f (patch) | |
| tree | 5b8c2ff5116a12e4e5164a3909862708bd589a24 /examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml | |
| parent | e77b7ef50522fc3f84dadf861646d900c2613cf4 (diff) | |
| parent | 30405c50a521146f2dda49916f160ab722316a82 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I39fbf07f7b4fd4fccdd504ee01e286061f4996a2
Diffstat (limited to 'examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml')
| -rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml index 8ab8598a..6a3576c4 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml @@ -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 QtDeclarative module 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. ** ** |