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/declarative/debugger/qdeclarativedebugserverconnection_p.h | |
| parent | e77b7ef50522fc3f84dadf861646d900c2613cf4 (diff) | |
| parent | 30405c50a521146f2dda49916f160ab722316a82 (diff) | |
| download | qtquick1-bf7ddcb7f1b2d854b0e957bf6ec3e88372853a5f.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I39fbf07f7b4fd4fccdd504ee01e286061f4996a2
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugserverconnection_p.h')
| -rw-r--r-- | src/declarative/debugger/qdeclarativedebugserverconnection_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h index 05d7bafd..190dac5e 100644 --- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h +++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h @@ -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 QtDeclarative module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** 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 +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ |