summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-02-10 21:28:54 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-02-10 21:28:54 +0000
commit00e2a32aa89b6051fb4e24561baa030e72291cba (patch)
tree8e4954a1354fe1f418fcf283e57872a5b9abd264
parente9c62b018f9a2e499e5ee054b2d3ab11937bdbc1 (diff)
parentccb52b1e964d45da5b0b212e16be6b42d02599c1 (diff)
Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into refs/staging/5.4
-rw-r--r--LICENSE.LGPLv212
-rw-r--r--LICENSE.LGPLv32
-rw-r--r--doc/src/legal/fdl.qdoc4
-rw-r--r--doc/src/legal/lgpl.qdoc4
-rw-r--r--doc/src/modules.qdoc4
5 files changed, 8 insertions, 8 deletions
diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21
index 341aa9eea..d26836dcc 100644
--- a/LICENSE.LGPLv21
+++ b/LICENSE.LGPLv21
@@ -1,6 +1,6 @@
GNU LESSER GENERAL PUBLIC LICENSE
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
You may use, distribute and copy the Qt GUI Toolkit under the terms of
diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3
index aed671a0c..747fb695c 100644
--- a/LICENSE.LGPLv3
+++ b/LICENSE.LGPLv3
@@ -1,6 +1,6 @@
GNU LESSER GENERAL PUBLIC LICENSE
- The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
You may use, distribute and copy the Qt GUI Toolkit under the terms of
diff --git a/doc/src/legal/fdl.qdoc b/doc/src/legal/fdl.qdoc
index e2a90d0d0..2ba8b1849 100644
--- a/doc/src/legal/fdl.qdoc
+++ b/doc/src/legal/fdl.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -35,7 +35,7 @@
Alternatively, you may use the documentation in accordance with the terms
contained in a written agreement between you and Digia.
- The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+ The Qt Toolkit is Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
Contact: \l{http://www.qt-project.org/legal}
Reference: \l{GNU Free Documentation License}
diff --git a/doc/src/legal/lgpl.qdoc b/doc/src/legal/lgpl.qdoc
index f3ec6b049..79047c536 100644
--- a/doc/src/legal/lgpl.qdoc
+++ b/doc/src/legal/lgpl.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -32,7 +32,7 @@
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) 2014 Digia Plc and/or its subsidiary(-ies) and other contributors.\br
+ 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
References:
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index c4132c3b3..b4f6a4305 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the documentation of the Qt Toolkit.
@@ -53,7 +53,7 @@
the following license.
\legalese
- Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).\br
+ Copyright (C) 2015 Digia Plc and/or its subsidiary(-ies).\br
Contact: http://www.qt-project.org/legal
You may use this file under the terms of the BSD license as follows: