summaryrefslogtreecommitdiff
path: root/src/lib/corelib/parser/qmljsparser.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-01-15 10:34:57 +0100
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-01-26 12:31:29 +0100
commit8dc50118a0ece90a997aaa93cd834dbd75f90639 (patch)
treea29d0bcceac4dadff34af6bbd1ef4391c27c75db /src/lib/corelib/parser/qmljsparser.cpp
parentff18f6944becdfb77f3294af80d5b7e9f8688fef (diff)
downloadqbs-8dc50118a0ece90a997aaa93cd834dbd75f90639.tar.gz
Update License
Change-Id: I092fca9f950de1ba38826c33b155f86feae2770b Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/corelib/parser/qmljsparser.cpp')
-rw-r--r--src/lib/corelib/parser/qmljsparser.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/corelib/parser/qmljsparser.cpp b/src/lib/corelib/parser/qmljsparser.cpp
index 6109c4a29..5ff434c34 100644
--- a/src/lib/corelib/parser/qmljsparser.cpp
+++ b/src/lib/corelib/parser/qmljsparser.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 Qt Creator.
**
@@ -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.
**
****************************************************************************/