summaryrefslogtreecommitdiff
path: root/doc/src/legal/lgpl.qdoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src/legal/lgpl.qdoc')
-rw-r--r--doc/src/legal/lgpl.qdoc18
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/src/legal/lgpl.qdoc b/doc/src/legal/lgpl.qdoc
index 79047c53..90955628 100644
--- a/doc/src/legal/lgpl.qdoc
+++ b/doc/src/legal/lgpl.qdoc
@@ -1,7 +1,7 @@
/****************************************************************************
**
-** Copyright (C) 2015 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$
@@ -32,8 +32,8 @@
Qt is available under the GNU Lesser General Public License version 3
and the GNU Lesser General Public License version 2.1.
- The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
- Contact: http://www.qt-project.org/legal
+ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd and other contributors.\br
+ Contact: http://www.qt.io/licensing/
References:
\list
@@ -47,7 +47,7 @@
\section1 LGPL version 2.1
\snippet snippets/code/doc_src_lgpl.qdoc LGPL v2.1
- \section1 Digia Qt LGPL Exception version 1.1
+ \section1 The Qt Company Qt LGPL Exception version 1.1
As a special exception to the GNU Lesser General Public License version 2.1,
the object code form of a "work that uses the Library" may incorporate material