diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-01-28 11:22:37 +0100 |
| commit | db46956af0862a6595f068df553004e53df5f5d6 (patch) | |
| tree | b9b59b7f74c2232b8c10b04a923130726310c931 /src/lib/qtprofilesetup/qtprofilesetup.cpp | |
| parent | 10b00e5c63af399775a7d1b2da3ea8df807eee98 (diff) | |
| parent | d4010ce842360d0fa5ba67f8dcb3267aae49092c (diff) | |
Merge branch '1.3' into 'master'
Conflicts:
doc/reference/jsextensions/jsextensions-general.qdoc
src/lib/corelib/language/evaluatorscriptclass.cpp
src/lib/corelib/language/evaluatorscriptclass.h
Change-Id: Ic9b77b56e8fc8bf93e0a553930757de8c93fed22
Diffstat (limited to 'src/lib/qtprofilesetup/qtprofilesetup.cpp')
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 83df72996..2b2f5a190 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -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 Qt Build Suite. ** @@ -9,8 +9,8 @@ ** 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://www.qt.io/licensing. For further information +** 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 @@ -22,8 +22,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 +** In addition, 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. ** ****************************************************************************/ |