diff options
Diffstat (limited to 'src/3rdparty')
25 files changed, 43 insertions, 51 deletions
diff --git a/src/3rdparty/angle/CONTRIBUTORS b/src/3rdparty/angle/CONTRIBUTORS index 94d009f2b3..6b27416e38 100644 --- a/src/3rdparty/angle/CONTRIBUTORS +++ b/src/3rdparty/angle/CONTRIBUTORS @@ -52,7 +52,7 @@ Autodesk, Inc. Cloud Party, Inc. Conor Dickinson -Digia Plc +The Qt Company Ltd. Andrew Knight Intel Corporation diff --git a/src/3rdparty/easing/easing.cpp b/src/3rdparty/easing/easing.cpp index 7d70a4d24b..3c31c08336 100644 --- a/src/3rdparty/easing/easing.cpp +++ b/src/3rdparty/easing/easing.cpp @@ -12,7 +12,7 @@ Redistribution and use in source and binary forms, with or without modification, * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * Neither the name of the author nor the names of contributors may be used to endorse or promote products derived derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ diff --git a/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c b/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c index 4daac0dc1d..95eba5c336 100644 --- a/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c +++ b/src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c @@ -11,7 +11,7 @@ * and/or other materials provided with the distribution. * The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. + * derived derived from this software without specific prior written permission. * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c index 660939415b..b43ac9c353 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-external.h b/src/3rdparty/harfbuzz/src/harfbuzz-external.h index a2de86843b..53592c3c46 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-external.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-external.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h index aa2e5b7ce3..69e0666b8a 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * Copyright (C) 2007 Red Hat, Inc. * * This is part of HarfBuzz, an OpenType Layout engine library. diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-greek.c b/src/3rdparty/harfbuzz/src/harfbuzz-greek.c index 9d45a9ae60..05ee06cdeb 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-greek.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-greek.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c b/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c index 109dd24b89..41d5545898 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c index 281a3b6c4f..a96ab39285 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c index 9128a93844..8f7edcece3 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-impl.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-impl.c @@ -1,6 +1,6 @@ /* * Copyright (C) 1998-2004 David Turner and Werner Lemberg - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * Copyright (C) 2007 Red Hat, Inc. * * This is part of HarfBuzz, an OpenType Layout engine library. diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp index 31026829dd..704ea9774a 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c b/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c index e9a9d6dc4b..809a55b863 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c index 91a353f5c0..1d02346cd9 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp index f474a20283..773f948164 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-all.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h index cd53c12ac6..870e9df01c 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper-private.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index 4ffaaee235..f7a4195308 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h index 73f6d8c0b5..9f210cb0d9 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c index 2175e9ef06..643a258df7 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 David Turner - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * Copyright (C) 2007 Red Hat, Inc. * * This is part of HarfBuzz, an OpenType Layout engine library. diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h index ed4122dfc1..d6dd94a7ea 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2005 David Turner - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c index e351dbfd49..b79e0b6cb7 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c b/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c index 7dc4cebfb2..e39fd0e1f2 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp b/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp index 7c73167f5d..c44f52752e 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/harfbuzz-qt.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp index bde8a49b4d..10818c565c 100644 --- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp +++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2015 The Qt Company Ltd * * This is part of HarfBuzz, an OpenType Layout engine library. * diff --git a/src/3rdparty/pcre/import_from_pcre_tarball.sh b/src/3rdparty/pcre/import_from_pcre_tarball.sh index ead4ac8c88..b1ada4d544 100755 --- a/src/3rdparty/pcre/import_from_pcre_tarball.sh +++ b/src/3rdparty/pcre/import_from_pcre_tarball.sh @@ -2,40 +2,32 @@ ############################################################################# ## ## Copyright (C) 2012 Giuseppe D'Angelo <dangelog@gmail.com>. -## Contact: http://www.qt-project.org/legal +## Contact: http://www.qt.io/licensing/ ## ## This file is the build configuration utility of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL$ +## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage ## 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 Lesser General Public License Usage ## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 as published by the Free Software -## Foundation and appearing in the file LICENSE.LGPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU Lesser General Public License version 2.1 requirements -## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## 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 +## 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. ## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3.0 as published by the Free Software -## Foundation and appearing in the file LICENSE.GPL included in the -## packaging of this file. Please review the following information to -## ensure the GNU General Public License version 3.0 requirements will be -## met: http://www.gnu.org/copyleft/gpl.html. -## -## ## $QT_END_LICENSE$ ## ############################################################################# diff --git a/src/3rdparty/sha1/sha1.cpp b/src/3rdparty/sha1/sha1.cpp index e111a7c88a..23c4275e29 100644 --- a/src/3rdparty/sha1/sha1.cpp +++ b/src/3rdparty/sha1/sha1.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 Toolkit. ** @@ -10,9 +10,9 @@ ** 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 Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,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 +** 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. ** ** $QT_END_LICENSE$ |