diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /src/3rdparty/harfbuzz/src | |
parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'src/3rdparty/harfbuzz/src')
18 files changed, 18 insertions, 18 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c index 5e7d7f0706..0293a5dadf 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-arabic.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 0c0db2045f..a2de86843b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-external.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-external.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 fedff7acc0..aa2e5b7ce3 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * 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 0da2fa7cc8..9d45a9ae60 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-greek.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-greek.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 e78ff38b9f..109dd24b89 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 ecf4cd1fbd..281a3b6c4f 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 9c55c8e261..9128a93844 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) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * 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 976e419fd4..021d1ff4ae 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-indic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 6a49a3380d..e9a9d6dc4b 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-khmer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 75c28440eb..14a963a540 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-myanmar.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 b32c78f458..f474a20283 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) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 fca36c8716..e5ed380fe7 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) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 2f1b7fe807..70efc76d7e 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 41782c4411..73f6d8c0b5 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 1afe604f02..2175e9ef06 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) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * 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 9bcd9d7e3a..ed4122dfc1 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) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 dc436c784a..d8f7d44887 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-thai.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-thai.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * 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 242fd6fd47..b745f22332 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-tibetan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) + * Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies) * * This is part of HarfBuzz, an OpenType Layout engine library. * |