diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-01-28 10:44:43 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-02-11 06:49:51 +0000 |
| commit | 83a5694dc21b8220bb0e5c85f24a53361b2fd478 (patch) | |
| tree | eb3b8507747a3423bf0ca6d56a5c6c6c10ed5d39 /src/3rdparty/harfbuzz | |
| parent | 29daa7645b8d93e4a53e8cd85288740a80f441e9 (diff) | |
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.
Outdated header.LGPL removed (use header.LGPL21 instead)
Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing
combination. New header.LGPL-COMM taken in the use file which were
using old header.LGPL3 (src/plugins/platforms/android/extract.cpp)
Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license
combination
Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe
Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/harfbuzz')
20 files changed, 20 insertions, 20 deletions
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. * |