From 684283ae80a6d844e80ac5f9ce4a816a3766a4f7 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 4 Feb 2015 12:41:28 +0200 Subject: Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ie7d37928ebd680c6f1b20045de11abcd5595c73f Reviewed-by: Jani Heikkinen Reviewed-by: Oswald Buddenhagen --- LGPL_EXCEPTION.txt | 2 +- LICENSE.GPLv2 | 4 +-- LICENSE.LGPLv21 | 4 +-- LICENSE.LGPLv3 | 4 +-- doc/src/examples/bearercloud.qdoc | 12 +++---- doc/src/examples/delayedencoding.qdoc | 12 +++---- doc/src/examples/desktopservices.qdoc | 12 +++---- doc/src/examples/embeddedsvgviewer.qdoc | 12 +++---- doc/src/examples/fluidlauncher.qdoc | 12 +++---- doc/src/examples/framebufferobject.qdoc | 12 +++---- doc/src/examples/systray.qdoc | 12 +++---- doc/src/examples/weatherinfo.qdoc | 12 +++---- .../draganddrop/delayedencoding/images/example.svg | 10 +++--- examples/svg/draganddrop/delayedencoding/main.cpp | 10 +++--- .../svg/draganddrop/delayedencoding/mimedata.cpp | 10 +++--- .../svg/draganddrop/delayedencoding/mimedata.h | 10 +++--- .../draganddrop/delayedencoding/sourcewidget.cpp | 10 +++--- .../svg/draganddrop/delayedencoding/sourcewidget.h | 10 +++--- .../svg/embedded/desktopservices/contenttab.cpp | 14 ++++---- examples/svg/embedded/desktopservices/contenttab.h | 14 ++++---- .../svg/embedded/desktopservices/desktopwidget.cpp | 14 ++++---- .../svg/embedded/desktopservices/desktopwidget.h | 14 ++++---- examples/svg/embedded/desktopservices/linktab.cpp | 18 +++++----- examples/svg/embedded/desktopservices/linktab.h | 14 ++++---- examples/svg/embedded/desktopservices/main.cpp | 14 ++++---- .../svg/embedded/fluidlauncher/demoapplication.cpp | 14 ++++---- .../svg/embedded/fluidlauncher/demoapplication.h | 14 ++++---- .../svg/embedded/fluidlauncher/fluidlauncher.cpp | 14 ++++---- .../svg/embedded/fluidlauncher/fluidlauncher.h | 14 ++++---- examples/svg/embedded/fluidlauncher/main.cpp | 14 ++++---- .../svg/embedded/fluidlauncher/pictureflow.cpp | 10 +++--- examples/svg/embedded/fluidlauncher/pictureflow.h | 10 +++--- examples/svg/embedded/fluidlauncher/slideshow.cpp | 14 ++++---- examples/svg/embedded/fluidlauncher/slideshow.h | 14 ++++---- examples/svg/embedded/weatherinfo/weatherinfo.cpp | 14 ++++---- .../svg/embeddedsvgviewer/embeddedsvgviewer.cpp | 14 ++++---- examples/svg/embeddedsvgviewer/embeddedsvgviewer.h | 14 ++++---- examples/svg/embeddedsvgviewer/main.cpp | 14 ++++---- examples/svg/network/bearercloud/bearercloud.cpp | 10 +++--- examples/svg/network/bearercloud/bearercloud.h | 10 +++--- examples/svg/network/bearercloud/cloud.cpp | 10 +++--- examples/svg/network/bearercloud/cloud.h | 10 +++--- examples/svg/network/bearercloud/main.cpp | 10 +++--- examples/svg/opengl/framebufferobject/glwidget.cpp | 10 +++--- examples/svg/opengl/framebufferobject/glwidget.h | 10 +++--- examples/svg/opengl/framebufferobject/main.cpp | 10 +++--- .../richtext/textobject/doc/src/textobject.qdoc | 12 +++---- examples/svg/richtext/textobject/main.cpp | 10 +++--- examples/svg/richtext/textobject/svgtextobject.cpp | 10 +++--- examples/svg/richtext/textobject/svgtextobject.h | 10 +++--- examples/svg/richtext/textobject/window.cpp | 10 +++--- examples/svg/richtext/textobject/window.h | 10 +++--- examples/svg/svggenerator/displaywidget.cpp | 10 +++--- examples/svg/svggenerator/displaywidget.h | 10 +++--- .../svg/svggenerator/doc/src/svggenerator.qdoc | 12 +++---- examples/svg/svggenerator/main.cpp | 10 +++--- examples/svg/svggenerator/window.cpp | 10 +++--- examples/svg/svggenerator/window.h | 10 +++--- examples/svg/svgviewer/doc/src/svgviewer.qdoc | 12 +++---- examples/svg/svgviewer/main.cpp | 10 +++--- examples/svg/svgviewer/mainwindow.cpp | 10 +++--- examples/svg/svgviewer/mainwindow.h | 10 +++--- examples/svg/svgviewer/svgview.cpp | 10 +++--- examples/svg/svgviewer/svgview.h | 10 +++--- src/plugins/iconengines/svgiconengine/main.cpp | 14 ++++---- .../iconengines/svgiconengine/qsvgiconengine.cpp | 14 ++++---- .../iconengines/svgiconengine/qsvgiconengine.h | 14 ++++---- src/plugins/imageformats/svg/main.cpp | 14 ++++---- src/plugins/imageformats/svg/qsvgiohandler.cpp | 14 ++++---- src/plugins/imageformats/svg/qsvgiohandler.h | 14 ++++---- src/svg/doc/snippets/doc_src_qtsvg.cpp | 10 +++--- src/svg/doc/snippets/doc_src_qtsvg.pro | 10 +++--- src/svg/doc/snippets/src_svg_qgraphicssvgitem.cpp | 10 +++--- src/svg/doc/src/qtsvg-index.qdoc | 12 +++---- src/svg/doc/src/qtsvg.qdoc | 12 +++---- src/svg/doc/src/svglicense.qdoc | 12 +++---- src/svg/doc/src/svgrendering.qdoc | 12 +++---- src/svg/qgraphicssvgitem.cpp | 14 ++++---- src/svg/qgraphicssvgitem.h | 14 ++++---- src/svg/qsvgfont.cpp | 14 ++++---- src/svg/qsvgfont_p.h | 14 ++++---- src/svg/qsvgfunctions_wince.cpp | 14 ++++---- src/svg/qsvgfunctions_wince_p.h | 14 ++++---- src/svg/qsvggenerator.cpp | 14 ++++---- src/svg/qsvggenerator.h | 14 ++++---- src/svg/qsvggraphics.cpp | 14 ++++---- src/svg/qsvggraphics_p.h | 14 ++++---- src/svg/qsvghandler.cpp | 14 ++++---- src/svg/qsvghandler_p.h | 14 ++++---- src/svg/qsvgnode.cpp | 14 ++++---- src/svg/qsvgnode_p.h | 14 ++++---- src/svg/qsvgrenderer.cpp | 14 ++++---- src/svg/qsvgrenderer.h | 14 ++++---- src/svg/qsvgstructure.cpp | 14 ++++---- src/svg/qsvgstructure_p.h | 14 ++++---- src/svg/qsvgstyle.cpp | 14 ++++---- src/svg/qsvgstyle_p.h | 14 ++++---- src/svg/qsvgtinydocument.cpp | 14 ++++---- src/svg/qsvgtinydocument_p.h | 14 ++++---- src/svg/qsvgwidget.cpp | 14 ++++---- src/svg/qsvgwidget.h | 14 ++++---- src/svg/qtsvgglobal.h | 12 +++---- src/svg/qtsvgglobal_p.h | 14 ++++---- tests/auto/compilerwarnings/data/test_cpp.txt | 38 +++++++++------------- tests/auto/qicon_svg/tst_qicon_svg.cpp | 14 ++++---- tests/auto/qsvgdevice/tst_qsvgdevice.cpp | 14 ++++---- tests/auto/qsvggenerator/tst_qsvggenerator.cpp | 14 ++++---- tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 14 ++++---- .../svg/qsvgrenderer/tst_qsvgrenderer.cpp | 14 ++++---- 109 files changed, 668 insertions(+), 676 deletions(-) diff --git a/LGPL_EXCEPTION.txt b/LGPL_EXCEPTION.txt index 7e2e30f..5cdacb9 100644 --- a/LGPL_EXCEPTION.txt +++ b/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company Qt LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 194c39c..6dbb032 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU General Public License version 2, which is displayed below. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 341aa9e..6e18461 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index aed671a..8fbb743 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -1,7 +1,7 @@ GNU LESSER GENERAL PUBLIC LICENSE - The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). - Contact: http://www.qt-project.org/legal + The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. + Contact: http://www.qt.io/licensing/ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. diff --git a/doc/src/examples/bearercloud.qdoc b/doc/src/examples/bearercloud.qdoc index 50063bd..eeead0d 100644 --- a/doc/src/examples/bearercloud.qdoc +++ b/doc/src/examples/bearercloud.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/delayedencoding.qdoc b/doc/src/examples/delayedencoding.qdoc index 14f0cdb..3c16360 100644 --- a/doc/src/examples/delayedencoding.qdoc +++ b/doc/src/examples/delayedencoding.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/desktopservices.qdoc b/doc/src/examples/desktopservices.qdoc index f3f58c1..6523c15 100644 --- a/doc/src/examples/desktopservices.qdoc +++ b/doc/src/examples/desktopservices.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/embeddedsvgviewer.qdoc b/doc/src/examples/embeddedsvgviewer.qdoc index 792e2b7..6e9e8fb 100644 --- a/doc/src/examples/embeddedsvgviewer.qdoc +++ b/doc/src/examples/embeddedsvgviewer.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/fluidlauncher.qdoc b/doc/src/examples/fluidlauncher.qdoc index ca43e09..2d941ae 100644 --- a/doc/src/examples/fluidlauncher.qdoc +++ b/doc/src/examples/fluidlauncher.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/framebufferobject.qdoc b/doc/src/examples/framebufferobject.qdoc index 02419f5..337b48e 100644 --- a/doc/src/examples/framebufferobject.qdoc +++ b/doc/src/examples/framebufferobject.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/systray.qdoc b/doc/src/examples/systray.qdoc index 43caa55..2cc8d7b 100644 --- a/doc/src/examples/systray.qdoc +++ b/doc/src/examples/systray.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc index a5a6c85..3b24528 100644 --- a/doc/src/examples/weatherinfo.qdoc +++ b/doc/src/examples/weatherinfo.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ diff --git a/examples/svg/draganddrop/delayedencoding/images/example.svg b/examples/svg/draganddrop/delayedencoding/images/example.svg index 7ae3ef5..196430f 100644 --- a/examples/svg/draganddrop/delayedencoding/images/example.svg +++ b/examples/svg/draganddrop/delayedencoding/images/example.svg @@ -1,8 +1,8 @@