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 /src/doc/src/declarative/propertybinding.qdoc | |
parent | e77b7ef50522fc3f84dadf861646d900c2613cf4 (diff) | |
parent | 30405c50a521146f2dda49916f160ab722316a82 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I39fbf07f7b4fd4fccdd504ee01e286061f4996a2
Diffstat (limited to 'src/doc/src/declarative/propertybinding.qdoc')
-rw-r--r-- | src/doc/src/declarative/propertybinding.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc index 450d2265..b1cd0377 100644 --- a/src/doc/src/declarative/propertybinding.qdoc +++ b/src/doc/src/declarative/propertybinding.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$ |