qt: update

1 files changed, 690 insertions, 760 deletions

diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch
index 1f57ccf..35cd61b 100644
--- a/src/qt-1-cherrypicks.patch
+++ b/src/qt-1-cherrypicks.patch
@@ -1,13 +1,10 @@
 This file is part of MXE.
 See index.html for further information.
 
-Commits backported (cherry-picked) from upstream branch or merge requests.
-http://qt.gitorious.org/qt
-Also contains MXE specific fixes.
-From f7acb6676a5950078500360aa0586becf4beb553 Mon Sep 17 00:00:00 2001
+From 71fbc365fe7bbdaaac533599970e5da6058c0d01 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:17:48 +0100
-Subject: [PATCH 01/19] remove trailing whitespace
+Subject: [PATCH 01/17] remove trailing whitespace
 
 backported from qt5/qtbase
 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
@@ -28,13 +25,13 @@ index 9090773..859ec8d 100644
                          ../plugins/codecs/tw/qbig5codec.h \
                          ../plugins/codecs/jp/qfontjpcodec.h
 -- 
-2.1.0
+2.1.4
 
 
-From 9ecb9ef79302deaab80adc8d97c923260d3dcaeb Mon Sep 17 00:00:00 2001
+From 8ec190bf3f9973060e24e6d91e7730878f55bd27 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 30 Jun 2011 10:22:33 +0200
-Subject: [PATCH 02/19] do not detect or configure iconv for Windows
+Subject: [PATCH 02/17] do not detect or configure iconv for Windows
 
 Qt doesn't use iconv on Windows, but configuring it will appear to
 work and the build will complete. The result is that character
@@ -49,10 +46,10 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83)
 
 diff --git a/configure b/configure
-index a9ba7c8..2e495a4 100755
+index 10ad7ca..25f16a5 100755
 --- a/configure
 +++ b/configure
-@@ -5810,7 +5810,7 @@ fi
+@@ -5815,7 +5815,7 @@ fi
  
  # auto-detect iconv(3) support
  if [ "$CFG_ICONV" != "no" ]; then
@@ -62,13 +59,13 @@ index a9ba7c8..2e495a4 100755
      elif compileTest "unix/iconv" "POSIX iconv"; then
          CFG_ICONV=yes
 -- 
-2.1.0
+2.1.4
 
 
-From 02f19c027ec896c6a42d9c02af4ca772151dc46b Mon Sep 17 00:00:00 2001
+From 1c62eae8be7321710c2bf47185da2ee3ec4c3613 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 11:43:10 +0100
-Subject: [PATCH 03/19] fix whitespace
+Subject: [PATCH 03/17] fix whitespace
 
 backported from qt5/qtbase
 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
@@ -136,13 +133,13 @@ index 859ec8d..70cd890 100644
                          ../plugins/codecs/tw/qbig5codec.cpp \
                          ../plugins/codecs/jp/qfontjpcodec.cpp
 -- 
-2.1.0
+2.1.4
 
 
-From 7294d08265fff3470580267f5585948926aef418 Mon Sep 17 00:00:00 2001
+From 1f3cca35dff62451a1e06cf6db3894e77afcaadd Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Jul 2011 00:42:24 +0200
-Subject: [PATCH 04/19] build and load text codecs regardless of iconv and
+Subject: [PATCH 04/17] build and load text codecs regardless of iconv and
  platform
 
 Otherwise applications linking to static Qt may have to import
@@ -223,7 +220,7 @@ index 70cd890..c847264 100644
  }
  symbian:LIBS += -lcharconv
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 58ffb00..1ee586e 100644
+index dacf5e4..c837c26 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -66,15 +66,14 @@
@@ -278,13 +275,13 @@ index 58ffb00..1ee586e 100644
  #endif // QT_NO_CODECS
  
 -- 
-2.1.0
+2.1.4
 
 
-From b262b83a888f975b3229e0d5d0ad40d6dd255347 Mon Sep 17 00:00:00 2001
+From e7cdbb9b7f3d98cab328e1e815041f0f486ef70d Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 13 Jan 2012 00:24:13 +0100
-Subject: [PATCH 05/19] move plugin text codecs to QtCore
+Subject: [PATCH 05/17] move plugin text codecs to QtCore
 
 Having plugin text codecs adds considerable complexity to
 configuring Qt. The plugin interface is designed for optional
@@ -362,14 +359,14 @@ index c847264..a1271b9 100644
  	SOURCES += codecs/qfontlaocodec.cpp
 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
 new file mode 100644
-index 0000000..7e1af4e
+index 0000000..fba4e60
 --- /dev/null
 +++ b/src/corelib/codecs/cp949codetbl_p.h
 @@ -0,0 +1,637 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -378,20 +375,21 @@ index 0000000..7e1af4e
 +** 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
@@ -402,7 +400,6 @@ index 0000000..7e1af4e
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -1005,14 +1002,14 @@ index 0000000..7e1af4e
 +#endif // CP494CODETBL_H
 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
 new file mode 100644
-index 0000000..2d37f56
+index 0000000..e5919e9
 --- /dev/null
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -0,0 +1,12788 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -1021,20 +1018,21 @@ index 0000000..2d37f56
 +** 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
@@ -1045,7 +1043,6 @@ index 0000000..2d37f56
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -13799,14 +13796,14 @@ index 0000000..2d37f56
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
 new file mode 100644
-index 0000000..334764c
+index 0000000..ee95d25
 --- /dev/null
 +++ b/src/corelib/codecs/qbig5codec_p.h
 @@ -0,0 +1,124 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -13815,20 +13812,21 @@ index 0000000..334764c
 +** 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
@@ -13839,7 +13837,6 @@ index 0000000..334764c
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -13929,14 +13926,14 @@ index 0000000..334764c
 +#endif // QBIG5CODEC_H
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
 new file mode 100644
-index 0000000..6e1be4a
+index 0000000..7fa4dc3
 --- /dev/null
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -0,0 +1,261 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -13945,20 +13942,21 @@ index 0000000..6e1be4a
 +** 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
@@ -13969,7 +13967,6 @@ index 0000000..6e1be4a
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -14196,14 +14193,14 @@ index 0000000..6e1be4a
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
 new file mode 100644
-index 0000000..bc3cbc7
+index 0000000..759ebb3
 --- /dev/null
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -14212,20 +14209,21 @@ index 0000000..bc3cbc7
 +** 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
@@ -14236,7 +14234,6 @@ index 0000000..bc3cbc7
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -14308,14 +14305,14 @@ index 0000000..bc3cbc7
 +#endif // QEUCJPCODEC_H
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
 new file mode 100644
-index 0000000..cb51181
+index 0000000..4e16179
 --- /dev/null
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -0,0 +1,3571 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -14324,20 +14321,21 @@ index 0000000..cb51181
 +** 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
@@ -14348,7 +14346,6 @@ index 0000000..cb51181
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -17885,14 +17882,14 @@ index 0000000..cb51181
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
 new file mode 100644
-index 0000000..c7a9b15
+index 0000000..622e1a6
 --- /dev/null
 +++ b/src/corelib/codecs/qeuckrcodec_p.h
 @@ -0,0 +1,129 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -17901,20 +17898,21 @@ index 0000000..c7a9b15
 +** 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
@@ -17925,7 +17923,6 @@ index 0000000..c7a9b15
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -18020,14 +18017,14 @@ index 0000000..c7a9b15
 +#endif // QEUCKRCODEC_H
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
 new file mode 100644
-index 0000000..d5139aa
+index 0000000..f472fdd
 --- /dev/null
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -0,0 +1,145 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -18036,20 +18033,21 @@ index 0000000..d5139aa
 +** 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
@@ -18060,7 +18058,6 @@ index 0000000..d5139aa
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -18171,14 +18168,14 @@ index 0000000..d5139aa
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
 new file mode 100644
-index 0000000..e905cd1
+index 0000000..67c4810
 --- /dev/null
 +++ b/src/corelib/codecs/qfontjpcodec_p.h
 @@ -0,0 +1,93 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -18187,20 +18184,21 @@ index 0000000..e905cd1
 +** 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
@@ -18211,7 +18209,6 @@ index 0000000..e905cd1
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -18270,14 +18267,14 @@ index 0000000..e905cd1
 +#endif // QFONTJPCODEC_H
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
 new file mode 100644
-index 0000000..06345ff
+index 0000000..b7dec3b
 --- /dev/null
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -0,0 +1,9265 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -18286,20 +18283,21 @@ index 0000000..06345ff
 +** 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
@@ -18310,7 +18308,6 @@ index 0000000..06345ff
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -27541,14 +27538,14 @@ index 0000000..06345ff
 +#endif // QT_NO_TEXTCODEC
 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
 new file mode 100644
-index 0000000..e3dd386
+index 0000000..91aa151
 --- /dev/null
 +++ b/src/corelib/codecs/qgb18030codec_p.h
 @@ -0,0 +1,159 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -27557,20 +27554,21 @@ index 0000000..e3dd386
 +** 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
@@ -27581,7 +27579,6 @@ index 0000000..e3dd386
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -27706,14 +27703,14 @@ index 0000000..e3dd386
 +#endif // QGB18030CODEC_H
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
 new file mode 100644
-index 0000000..2c9be691
+index 0000000..c637832
 --- /dev/null
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -0,0 +1,367 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -27722,20 +27719,21 @@ index 0000000..2c9be691
 +** 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
@@ -27746,7 +27744,6 @@ index 0000000..2c9be691
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -28079,14 +28076,14 @@ index 0000000..2c9be691
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
 new file mode 100644
-index 0000000..f6ba975
+index 0000000..3cc48dc
 --- /dev/null
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -28095,20 +28092,21 @@ index 0000000..f6ba975
 +** 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
@@ -28119,7 +28117,6 @@ index 0000000..f6ba975
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -28191,14 +28188,14 @@ index 0000000..f6ba975
 +#endif // QJISCODEC_H
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
 new file mode 100644
-index 0000000..66f2e34
+index 0000000..6e8b2f5
 --- /dev/null
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -0,0 +1,10700 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -28207,20 +28204,21 @@ index 0000000..66f2e34
 +** 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
@@ -28231,7 +28229,6 @@ index 0000000..66f2e34
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -38897,14 +38894,14 @@ index 0000000..66f2e34
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
 new file mode 100644
-index 0000000..83bb8e1
+index 0000000..07b9b23
 --- /dev/null
 +++ b/src/corelib/codecs/qjpunicode_p.h
 @@ -0,0 +1,174 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -38913,20 +38910,21 @@ index 0000000..83bb8e1
 +** 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
@@ -38937,7 +38935,6 @@ index 0000000..83bb8e1
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -39077,14 +39074,14 @@ index 0000000..83bb8e1
 +#endif // QJPUNICODE_H
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
 new file mode 100644
-index 0000000..977f38f
+index 0000000..a9bc11a
 --- /dev/null
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -0,0 +1,229 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -39093,20 +39090,21 @@ index 0000000..977f38f
 +** 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
@@ -39117,7 +39115,6 @@ index 0000000..977f38f
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -39312,14 +39309,14 @@ index 0000000..977f38f
 +QT_END_NAMESPACE
 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
 new file mode 100644
-index 0000000..a4c0981
+index 0000000..49a77f7
 --- /dev/null
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** 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 plugins of the Qt Toolkit.
 +**
@@ -39328,20 +39325,21 @@ index 0000000..a4c0981
 +** 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
@@ -39352,7 +39350,6 @@ index 0000000..a4c0981
 +** ensure the GNU General Public License version 3.0 requirements will be
 +** met: http://www.gnu.org/copyleft/gpl.html.
 +**
-+**
 +** $QT_END_LICENSE$
 +**
 +****************************************************************************/
@@ -39423,7 +39420,7 @@ index 0000000..a4c0981
 +
 +#endif // QSJISCODEC_H
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 1ee586e..1376b67 100644
+index c837c26..ee34492 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -67,16 +67,16 @@
@@ -39474,14 +39471,14 @@ index b0a8a91..0000000
 -symbian:TARGET.UID3=0x2001E615
 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp
 deleted file mode 100644
-index 12421a9..0000000
+index 968f11f..0000000
 --- a/src/plugins/codecs/cn/main.cpp
 +++ /dev/null
 @@ -1,145 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -39490,20 +39487,21 @@ index 12421a9..0000000
 -** 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
@@ -39514,7 +39512,6 @@ index 12421a9..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -39625,14 +39622,14 @@ index 12421a9..0000000
 -#endif // QT_NO_TEXTCODECPLUGIN
 diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp
 deleted file mode 100644
-index 06345ff..0000000
+index b7dec3b..0000000
 --- a/src/plugins/codecs/cn/qgb18030codec.cpp
 +++ /dev/null
 @@ -1,9265 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -39641,20 +39638,21 @@ index 06345ff..0000000
 -** 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
@@ -39665,7 +39663,6 @@ index 06345ff..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -48896,14 +48893,14 @@ index 06345ff..0000000
 -#endif // QT_NO_TEXTCODEC
 diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h
 deleted file mode 100644
-index e3dd386..0000000
+index 91aa151..0000000
 --- a/src/plugins/codecs/cn/qgb18030codec.h
 +++ /dev/null
 @@ -1,159 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -48912,20 +48909,21 @@ index e3dd386..0000000
 -** 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
@@ -48936,7 +48934,6 @@ index e3dd386..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49104,14 +49101,14 @@ index 6480e43..0000000
 -symbian:TARGET.UID3=0x2001E614
 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp
 deleted file mode 100644
-index 04b129a..0000000
+index e1abe8b..0000000
 --- a/src/plugins/codecs/jp/main.cpp
 +++ /dev/null
 @@ -1,149 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49120,20 +49117,21 @@ index 04b129a..0000000
 -** 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
@@ -49144,7 +49142,6 @@ index 04b129a..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49259,14 +49256,14 @@ index 04b129a..0000000
 -#endif // QT_NO_TEXTCODECPLUGIN
 diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
 deleted file mode 100644
-index 6e1be4a..0000000
+index 7fa4dc3..0000000
 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp
 +++ /dev/null
 @@ -1,261 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49275,20 +49272,21 @@ index 6e1be4a..0000000
 -** 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
@@ -49299,7 +49297,6 @@ index 6e1be4a..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49526,14 +49523,14 @@ index 6e1be4a..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
 deleted file mode 100644
-index bc3cbc7..0000000
+index 759ebb3..0000000
 --- a/src/plugins/codecs/jp/qeucjpcodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49542,20 +49539,21 @@ index bc3cbc7..0000000
 -** 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
@@ -49566,7 +49564,6 @@ index bc3cbc7..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49638,14 +49635,14 @@ index bc3cbc7..0000000
 -#endif // QEUCJPCODEC_H
 diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp
 deleted file mode 100644
-index d5139aa..0000000
+index f472fdd..0000000
 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp
 +++ /dev/null
 @@ -1,145 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49654,20 +49651,21 @@ index d5139aa..0000000
 -** 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
@@ -49678,7 +49676,6 @@ index d5139aa..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49789,14 +49786,14 @@ index d5139aa..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h
 deleted file mode 100644
-index e905cd1..0000000
+index 67c4810..0000000
 --- a/src/plugins/codecs/jp/qfontjpcodec.h
 +++ /dev/null
 @@ -1,93 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49805,20 +49802,21 @@ index e905cd1..0000000
 -** 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
@@ -49829,7 +49827,6 @@ index e905cd1..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -49888,14 +49885,14 @@ index e905cd1..0000000
 -#endif // QFONTJPCODEC_H
 diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp
 deleted file mode 100644
-index 2c9be691..0000000
+index c637832..0000000
 --- a/src/plugins/codecs/jp/qjiscodec.cpp
 +++ /dev/null
 @@ -1,367 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -49904,20 +49901,21 @@ index 2c9be691..0000000
 -** 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
@@ -49928,7 +49926,6 @@ index 2c9be691..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -50261,14 +50258,14 @@ index 2c9be691..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
 deleted file mode 100644
-index f6ba975..0000000
+index 3cc48dc..0000000
 --- a/src/plugins/codecs/jp/qjiscodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -50277,20 +50274,21 @@ index f6ba975..0000000
 -** 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
@@ -50301,7 +50299,6 @@ index f6ba975..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -50373,14 +50370,14 @@ index f6ba975..0000000
 -#endif // QJISCODEC_H
 diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp
 deleted file mode 100644
-index 66f2e34..0000000
+index 6e8b2f5..0000000
 --- a/src/plugins/codecs/jp/qjpunicode.cpp
 +++ /dev/null
 @@ -1,10700 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -50389,20 +50386,21 @@ index 66f2e34..0000000
 -** 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
@@ -50413,7 +50411,6 @@ index 66f2e34..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -61079,14 +61076,14 @@ index 66f2e34..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
 deleted file mode 100644
-index 83bb8e1..0000000
+index 07b9b23..0000000
 --- a/src/plugins/codecs/jp/qjpunicode.h
 +++ /dev/null
 @@ -1,174 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -61095,20 +61092,21 @@ index 83bb8e1..0000000
 -** 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
@@ -61119,7 +61117,6 @@ index 83bb8e1..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -61259,14 +61256,14 @@ index 83bb8e1..0000000
 -#endif // QJPUNICODE_H
 diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
 deleted file mode 100644
-index 977f38f..0000000
+index a9bc11a..0000000
 --- a/src/plugins/codecs/jp/qsjiscodec.cpp
 +++ /dev/null
 @@ -1,229 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -61275,20 +61272,21 @@ index 977f38f..0000000
 -** 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
@@ -61299,7 +61297,6 @@ index 977f38f..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -61494,14 +61491,14 @@ index 977f38f..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
 deleted file mode 100644
-index a4c0981..0000000
+index 49a77f7..0000000
 --- a/src/plugins/codecs/jp/qsjiscodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -61510,20 +61507,21 @@ index a4c0981..0000000
 -** 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
@@ -61534,7 +61532,6 @@ index a4c0981..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -61606,14 +61603,14 @@ index a4c0981..0000000
 -#endif // QSJISCODEC_H
 diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h
 deleted file mode 100644
-index 7e1af4e..0000000
+index fba4e60..0000000
 --- a/src/plugins/codecs/kr/cp949codetbl.h
 +++ /dev/null
 @@ -1,637 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -61622,20 +61619,21 @@ index 7e1af4e..0000000
 -** 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
@@ -61646,7 +61644,6 @@ index 7e1af4e..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -62275,14 +62272,14 @@ index 1cc28d8..0000000
 -symbian:TARGET.UID3=0x2001B2E5
 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp
 deleted file mode 100644
-index 918b8bd..0000000
+index d15830c..0000000
 --- a/src/plugins/codecs/kr/main.cpp
 +++ /dev/null
 @@ -1,131 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -62291,20 +62288,21 @@ index 918b8bd..0000000
 -** 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
@@ -62315,7 +62313,6 @@ index 918b8bd..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -62412,14 +62409,14 @@ index 918b8bd..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
 deleted file mode 100644
-index cb51181..0000000
+index 4e16179..0000000
 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp
 +++ /dev/null
 @@ -1,3571 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -62428,20 +62425,21 @@ index cb51181..0000000
 -** 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
@@ -62452,7 +62450,6 @@ index cb51181..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -65989,14 +65986,14 @@ index cb51181..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h
 deleted file mode 100644
-index c7a9b15..0000000
+index 622e1a6..0000000
 --- a/src/plugins/codecs/kr/qeuckrcodec.h
 +++ /dev/null
 @@ -1,129 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -66005,20 +66002,21 @@ index c7a9b15..0000000
 -** 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
@@ -66029,7 +66027,6 @@ index c7a9b15..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -66124,14 +66121,14 @@ index c7a9b15..0000000
 -#endif // QEUCKRCODEC_H
 diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp
 deleted file mode 100644
-index 30e6d8c..0000000
+index 8f8e84a..0000000
 --- a/src/plugins/codecs/tw/main.cpp
 +++ /dev/null
 @@ -1,138 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -66140,20 +66137,21 @@ index 30e6d8c..0000000
 -** 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
@@ -66164,7 +66162,6 @@ index 30e6d8c..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -66268,14 +66265,14 @@ index 30e6d8c..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp
 deleted file mode 100644
-index 2d37f56..0000000
+index e5919e9..0000000
 --- a/src/plugins/codecs/tw/qbig5codec.cpp
 +++ /dev/null
 @@ -1,12788 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -66284,20 +66281,21 @@ index 2d37f56..0000000
 -** 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
@@ -66308,7 +66306,6 @@ index 2d37f56..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -79062,14 +79059,14 @@ index 2d37f56..0000000
 -QT_END_NAMESPACE
 diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
 deleted file mode 100644
-index 334764c..0000000
+index ee95d25..0000000
 --- a/src/plugins/codecs/tw/qbig5codec.h
 +++ /dev/null
 @@ -1,124 +0,0 @@
 -/****************************************************************************
 -**
--** 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 plugins of the Qt Toolkit.
 -**
@@ -79078,20 +79075,21 @@ index 334764c..0000000
 -** 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
@@ -79102,7 +79100,6 @@ index 334764c..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -79229,13 +79226,13 @@ index 94ce675..c4af49b 100644
  !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems
  embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 -- 
-2.1.0
+2.1.4
 
 
-From f83e70e53314cfed3329f5b0640ef3d8f91f8d02 Mon Sep 17 00:00:00 2001
+From c0127a5e399f9483cf3738d96f819913bec0fea2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jan 2012 21:01:26 +0100
-Subject: [PATCH 06/19] update private header references
+Subject: [PATCH 06/17] update private header references
 
 backported from qt5/qtbase
 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
@@ -79244,7 +79241,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa)
 
 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
-index 2d37f56..1b46859 100644
+index e5919e9..a3b1ff8 100644
 --- a/src/corelib/codecs/qbig5codec.cpp
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -39,7 +39,7 @@
@@ -79257,7 +79254,7 @@ index 2d37f56..1b46859 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
-index 6e1be4a..6f09059 100644
+index 7fa4dc3..8e3a600 100644
 --- a/src/corelib/codecs/qeucjpcodec.cpp
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -73,7 +73,7 @@
@@ -79270,7 +79267,7 @@ index 6e1be4a..6f09059 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
-index bc3cbc7..c717050 100644
+index 759ebb3..fe02c4c 100644
 --- a/src/corelib/codecs/qeucjpcodec_p.h
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -71,7 +71,7 @@
@@ -79283,7 +79280,7 @@ index bc3cbc7..c717050 100644
  #include <QtCore/qlist.h>
  
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
-index cb51181..a66d4e2 100644
+index 4e16179..4212707 100644
 --- a/src/corelib/codecs/qeuckrcodec.cpp
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -65,8 +65,8 @@
@@ -79298,7 +79295,7 @@ index cb51181..a66d4e2 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
-index d5139aa..fdd594a 100644
+index f472fdd..6219603 100644
 --- a/src/corelib/codecs/qfontjpcodec.cpp
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -39,9 +39,9 @@
@@ -79314,7 +79311,7 @@ index d5139aa..fdd594a 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
-index 06345ff..01682d8 100644
+index b7dec3b..4cc8f1b 100644
 --- a/src/corelib/codecs/qgb18030codec.cpp
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -44,7 +44,7 @@
@@ -79327,7 +79324,7 @@ index 06345ff..01682d8 100644
  #ifndef QT_NO_TEXTCODEC
  
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
-index 2c9be691..af9a32c 100644
+index c637832..e9747e3 100644
 --- a/src/corelib/codecs/qjiscodec.cpp
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -48,7 +48,7 @@
@@ -79340,7 +79337,7 @@ index 2c9be691..af9a32c 100644
  
  QT_BEGIN_NAMESPACE
 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
-index f6ba975..0d14b48 100644
+index 3cc48dc..a320d61 100644
 --- a/src/corelib/codecs/qjiscodec_p.h
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -71,7 +71,7 @@
@@ -79353,7 +79350,7 @@ index f6ba975..0d14b48 100644
  #include <QtCore/qlist.h>
  
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
-index 66f2e34..304d26e 100644
+index 6e8b2f5..b4d7bf7 100644
 --- a/src/corelib/codecs/qjpunicode.cpp
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -44,7 +44,7 @@
@@ -79366,7 +79363,7 @@ index 66f2e34..304d26e 100644
  #include "qbytearray.h"
  #include <stdlib.h>
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
-index 977f38f..5c69748 100644
+index a9bc11a..00baca1 100644
 --- a/src/corelib/codecs/qsjiscodec.cpp
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -48,7 +48,7 @@
@@ -79379,7 +79376,7 @@ index 977f38f..5c69748 100644
  
  QT_BEGIN_NAMESPACE
 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
-index a4c0981..5025968 100644
+index 49a77f7..098a590 100644
 --- a/src/corelib/codecs/qsjiscodec_p.h
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -71,7 +71,7 @@
@@ -79392,13 +79389,13 @@ index a4c0981..5025968 100644
  #include <QtCore/qlist.h>
  
 -- 
-2.1.0
+2.1.4
 
 
-From d83cb542ed81668261fd0267f1dfaef581228ff6 Mon Sep 17 00:00:00 2001
+From 1c897873ed8ffe564c101e621afadb63b241ff57 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sun, 3 Jul 2011 21:53:27 +0200
-Subject: [PATCH 07/19] cosmetic adjustments for files moved to core/codecs
+Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs
 
 -update old reference to 'plugin'
 -rename multiple inclusion guards
@@ -79411,12 +79408,12 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967)
 
 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
-index 7e1af4e..952090a 100644
+index fba4e60..1c678d8 100644
 --- a/src/corelib/codecs/cp949codetbl_p.h
 +++ b/src/corelib/codecs/cp949codetbl_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79452,12 +79449,12 @@ index 7e1af4e..952090a 100644
 -#endif // CP494CODETBL_H
 +#endif // CP494CODETBL_P_H
 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
-index 1b46859..d48ccaf 100644
+index a3b1ff8..526ff51 100644
 --- a/src/corelib/codecs/qbig5codec.cpp
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79465,12 +79462,12 @@ index 1b46859..d48ccaf 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
-index 334764c..ba3b345 100644
+index ee95d25..50de2bb 100644
 --- a/src/corelib/codecs/qbig5codec_p.h
 +++ b/src/corelib/codecs/qbig5codec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79506,12 +79503,12 @@ index 334764c..ba3b345 100644
 -#endif // QBIG5CODEC_H
 +#endif // QBIG5CODEC_P_H
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
-index 6f09059..f4cb649 100644
+index 8e3a600..29b4fc1 100644
 --- a/src/corelib/codecs/qeucjpcodec.cpp
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79519,12 +79516,12 @@ index 6f09059..f4cb649 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
-index c717050..b6d6c6b 100644
+index fe02c4c..e07e424 100644
 --- a/src/corelib/codecs/qeucjpcodec_p.h
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79560,12 +79557,12 @@ index c717050..b6d6c6b 100644
 -#endif // QEUCJPCODEC_H
 +#endif // QEUCJPCODEC_P_H
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
-index a66d4e2..33e6786 100644
+index 4212707..9475c85 100644
 --- a/src/corelib/codecs/qeuckrcodec.cpp
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79573,12 +79570,12 @@ index a66d4e2..33e6786 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
-index c7a9b15..ebe334d 100644
+index 622e1a6..300d4d3 100644
 --- a/src/corelib/codecs/qeuckrcodec_p.h
 +++ b/src/corelib/codecs/qeuckrcodec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79614,12 +79611,12 @@ index c7a9b15..ebe334d 100644
 -#endif // QEUCKRCODEC_H
 +#endif // QEUCKRCODEC_P_H
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
-index fdd594a..c79d9d5 100644
+index 6219603..371b47d 100644
 --- a/src/corelib/codecs/qfontjpcodec.cpp
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79627,12 +79624,12 @@ index fdd594a..c79d9d5 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
-index e905cd1..0eea2cd 100644
+index 67c4810..33e8e57 100644
 --- a/src/corelib/codecs/qfontjpcodec_p.h
 +++ b/src/corelib/codecs/qfontjpcodec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79668,12 +79665,12 @@ index e905cd1..0eea2cd 100644
 -#endif // QFONTJPCODEC_H
 +#endif // QFONTJPCODEC_P_H
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
-index 01682d8..37bc141 100644
+index 4cc8f1b..1278b1e 100644
 --- a/src/corelib/codecs/qgb18030codec.cpp
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79681,12 +79678,12 @@ index 01682d8..37bc141 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
-index e3dd386..826edf7 100644
+index 91aa151..0406c41 100644
 --- a/src/corelib/codecs/qgb18030codec_p.h
 +++ b/src/corelib/codecs/qgb18030codec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79722,12 +79719,12 @@ index e3dd386..826edf7 100644
 -#endif // QGB18030CODEC_H
 +#endif // QGB18030CODEC_P_H
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
-index af9a32c..dd7e1ee 100644
+index e9747e3..1b78eca 100644
 --- a/src/corelib/codecs/qjiscodec.cpp
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79735,12 +79732,12 @@ index af9a32c..dd7e1ee 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
-index 0d14b48..e75dbd6 100644
+index a320d61..6831e8b 100644
 --- a/src/corelib/codecs/qjiscodec_p.h
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79776,12 +79773,12 @@ index 0d14b48..e75dbd6 100644
 -#endif // QJISCODEC_H
 +#endif // QJISCODEC_P_H
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
-index 304d26e..0c24168 100644
+index b4d7bf7..57ac03e 100644
 --- a/src/corelib/codecs/qjpunicode.cpp
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79789,12 +79786,12 @@ index 304d26e..0c24168 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
-index 83bb8e1..9497911 100644
+index 07b9b23..1a43db9 100644
 --- a/src/corelib/codecs/qjpunicode_p.h
 +++ b/src/corelib/codecs/qjpunicode_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79830,12 +79827,12 @@ index 83bb8e1..9497911 100644
 -#endif // QJPUNICODE_H
 +#endif // QJPUNICODE_P_H
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
-index 5c69748..cc87d1a 100644
+index 00baca1..c31f9c8 100644
 --- a/src/corelib/codecs/qsjiscodec.cpp
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79843,12 +79840,12 @@ index 5c69748..cc87d1a 100644
  ** $QT_BEGIN_LICENSE:LGPL$
  ** Commercial License Usage
 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
-index 5025968..6dd8902 100644
+index 098a590..951c248 100644
 --- a/src/corelib/codecs/qsjiscodec_p.h
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -3,7 +3,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 plugins of the Qt Toolkit.
 +** This file is part of the QtCore module of the Qt Toolkit.
@@ -79884,13 +79881,13 @@ index 5025968..6dd8902 100644
 -#endif // QSJISCODEC_H
 +#endif // QSJISCODEC_P_H
 -- 
-2.1.0
+2.1.4
 
 
-From 04dc59bf0b9f0ab787d90d42d9dd8d8907346af4 Mon Sep 17 00:00:00 2001
+From 5dc34d557dc3f6ade4ac02e543f0b43cf15c92ba Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 12 Jan 2012 10:43:29 +0100
-Subject: [PATCH 08/19] remove obsolete codec plugin loading code
+Subject: [PATCH 08/17] remove obsolete codec plugin loading code
 
 backported from qt5/qtbase
 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
@@ -79933,7 +79930,7 @@ index a1271b9..9274eda 100644
      codecs/qjpunicode.cpp \
      codecs/qeucjpcodec.cpp \
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 1376b67..efce435 100644
+index ee34492..d04b6e0 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -48,11 +48,6 @@
@@ -80081,14 +80078,14 @@ index 1376b67..efce435 100644
  
 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp
 deleted file mode 100644
-index 6cfa84e..0000000
+index 0c55974..0000000
 --- a/src/corelib/codecs/qtextcodecplugin.cpp
 +++ /dev/null
 @@ -1,161 +0,0 @@
 -/****************************************************************************
 -**
--** 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 QtCore module of the Qt Toolkit.
 -**
@@ -80097,20 +80094,21 @@ index 6cfa84e..0000000
 -** 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
@@ -80121,7 +80119,6 @@ index 6cfa84e..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -80248,14 +80245,14 @@ index 6cfa84e..0000000
 -#endif // QT_NO_TEXTCODECPLUGIN
 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h
 deleted file mode 100644
-index 3258207..0000000
+index baf4a08..0000000
 --- a/src/corelib/codecs/qtextcodecplugin.h
 +++ /dev/null
 @@ -1,96 +0,0 @@
 -/****************************************************************************
 -**
--** 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 QtCore module of the Qt Toolkit.
 -**
@@ -80264,20 +80261,21 @@ index 3258207..0000000
 -** 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
@@ -80288,7 +80286,6 @@ index 3258207..0000000
 -** ensure the GNU General Public License version 3.0 requirements will be
 -** met: http://www.gnu.org/copyleft/gpl.html.
 -**
--**
 -** $QT_END_LICENSE$
 -**
 -****************************************************************************/
@@ -80349,7 +80346,7 @@ index 3258207..0000000
 -
 -#endif // QTEXTCODECPLUGIN_H
 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
-index b23f601..effe986 100644
+index a143762..cfe6bb5 100644
 --- a/src/corelib/global/qconfig-medium.h
 +++ b/src/corelib/global/qconfig-medium.h
 @@ -91,9 +91,6 @@
@@ -80363,7 +80360,7 @@ index b23f601..effe986 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
-index 54f7a31..af4bd5f 100644
+index 3f1e467..31f2b11 100644
 --- a/src/corelib/global/qconfig-minimal.h
 +++ b/src/corelib/global/qconfig-minimal.h
 @@ -167,9 +167,6 @@
@@ -80377,7 +80374,7 @@ index 54f7a31..af4bd5f 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
-index adeb249..d18797b 100644
+index 572a0a2..359fd90 100644
 --- a/src/corelib/global/qconfig-nacl.h
 +++ b/src/corelib/global/qconfig-nacl.h
 @@ -128,9 +128,6 @@
@@ -80391,7 +80388,7 @@ index adeb249..d18797b 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
-index d602fb5..957d7ee 100644
+index b0f0e61..52af4ef 100644
 --- a/src/corelib/global/qconfig-small.h
 +++ b/src/corelib/global/qconfig-small.h
 @@ -128,9 +128,6 @@
@@ -80405,7 +80402,7 @@ index d602fb5..957d7ee 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
-index 316e718..6acd0fb 100644
+index 9048248..c24f24d 100644
 --- a/src/corelib/global/qfeatures.h
 +++ b/src/corelib/global/qfeatures.h
 @@ -643,11 +643,6 @@
@@ -80421,13 +80418,13 @@ index 316e718..6acd0fb 100644
  #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
  #define QT_NO_COLORDIALOG
 -- 
-2.1.0
+2.1.4
 
 
-From 9a38d6f343045133d3093aabee715aa4eeb84e7a Mon Sep 17 00:00:00 2001
+From ca1433726aa600258482ff19e7e06bb7579d2bea Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 23 Jan 2012 23:12:46 +0100
-Subject: [PATCH 09/19] remove vestiges of text codec plugins
+Subject: [PATCH 09/17] remove vestiges of text codec plugins
 
 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
 
@@ -80455,13 +80452,13 @@ index dea05e0..12cd8ea 100644
  Description: Supports translations using QObject::tr().
  Section: Internationalization
 -- 
-2.1.0
+2.1.4
 
 
-From 376cc3027f9cc2d90af96e7cb964f6e8e9d8a464 Mon Sep 17 00:00:00 2001
+From 91a40f0dad01ff86e2a20877d2bd7843ee0bc0f2 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 15:10:26 +0100
-Subject: [PATCH 10/19] use pkg-config for libmng (MXE specific)
+Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific)
 
 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
 
@@ -80481,13 +80478,13 @@ index ffb98de..6aab68f 100644
  } else {
      include($$PWD/../../3rdparty/libmng.pri)
 -- 
-2.1.0
+2.1.4
 
 
-From 7d62ca1f73ed19db7e3cb87d60117ed056e9af87 Mon Sep 17 00:00:00 2001
+From cf3d3e0cba6d3825700000315c7d55c0b5e8e834 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Thu, 3 Nov 2011 14:11:02 +0100
-Subject: [PATCH 11/19] use pkg-config for libtiff-4 (MXE specific)
+Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific)
 
 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
 
@@ -80507,13 +80504,13 @@ index e1cc3ee..71cbab1 100644
  } else {
      include($$PWD/../../3rdparty/libtiff.pri)
 -- 
-2.1.0
+2.1.4
 
 
-From 713dd9fee42c94151cd060bccef58429d2af04d4 Mon Sep 17 00:00:00 2001
+From 3114536d3f81070801d20f7918009da5d19903bc Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:47:10 +0200
-Subject: [PATCH 12/19] fix building on GNU/kFreeBSD (MXE specific)
+Subject: [PATCH 12/17] fix building on GNU/kFreeBSD (MXE specific)
 
 This patch has been taken from:
 
@@ -80525,7 +80522,7 @@ Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
 Last-Update: 2010-10-06
 
 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
-index 96fbeee..5bd8c80 100644
+index 7b69922..44efb01 100644
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
@@ -80538,13 +80535,13 @@ index 96fbeee..5bd8c80 100644
  #  define Q_OS_NETBSD
  #  define Q_OS_BSD4
 -- 
-2.1.0
+2.1.4
 
 
-From 1957ef52ed0246f661a6bbfc994d0a15617f41f0 Mon Sep 17 00:00:00 2001
+From 361a81da244071ed138b03f15e8673f4039635eb Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:49:47 +0200
-Subject: [PATCH 13/19] fix missing platform when building on GNU/kFreeBSD (MXE
+Subject: [PATCH 13/17] fix missing platform when building on GNU/kFreeBSD (MXE
  specific)
 
 This patch is inspired by:
@@ -80555,10 +80552,10 @@ For the time being, glibc-g++ is simply a copy of linux-g++.
 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95
 
 diff --git a/configure b/configure
-index 2e495a4..4965d90 100755
+index 25f16a5..d044883 100755
 --- a/configure
 +++ b/configure
-@@ -2877,6 +2877,9 @@ if [ -z "$PLATFORM" ]; then
+@@ -2881,6 +2881,9 @@ if [ -z "$PLATFORM" ]; then
       GNU:*)
          PLATFORM=hurd-g++
          ;;
@@ -80569,13 +80566,13 @@ index 2e495a4..4965d90 100755
          PLATFORM=dgux-g++
          ;;
 -- 
-2.1.0
+2.1.4
 
 
-From 4df31e3967977d0726877e32d66394bef820cb5d Mon Sep 17 00:00:00 2001
+From 7e6725606c223301139f990e5633e03dae058cef Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:51:50 +0200
-Subject: [PATCH 14/19] fix building on dragonfly (MXE specific)
+Subject: [PATCH 14/17] fix building on dragonfly (MXE specific)
 
 This patch is inspired by:
 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
@@ -80583,10 +80580,10 @@ http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27
 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d
 
 diff --git a/configure b/configure
-index 4965d90..e1e7384 100755
+index d044883..dee735b 100755
 --- a/configure
 +++ b/configure
-@@ -2889,7 +2889,7 @@ if [ -z "$PLATFORM" ]; then
+@@ -2893,7 +2893,7 @@ if [ -z "$PLATFORM" ]; then
       ULTRIX:*)
          PLATFORM=ultrix-g++
          ;;
@@ -80596,13 +80593,13 @@ index 4965d90..e1e7384 100755
          PLATFORM_NOTES="
              - Also available for FreeBSD: freebsd-icc
 -- 
-2.1.0
+2.1.4
 
 
-From d2b06e4775fb0b0faf83cb99b3443a9fe036f237 Mon Sep 17 00:00:00 2001
+From b5124ae6ecba4444614b01600979c692015766e8 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Wed, 30 Apr 2014 22:12:35 +0200
-Subject: [PATCH 15/19] fix for designer in shared build (MXE specific)
+Subject: [PATCH 15/17] fix for designer in shared build (MXE specific)
 
 Change-Id: I23afe70c17e88d63b649d851f89e187da9b79d96
 
@@ -80620,39 +80617,13 @@ index f58df8a..0c25ed4 100644
  
  # Input
 -- 
-2.1.0
-
+2.1.4
 
-From 31d8a5c526bdde7a1026380c269ba99baf2d38b1 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 30 Apr 2014 23:17:58 +0200
-Subject: [PATCH 16/19] fix include of private header
-
-Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-(cherry picked from commit b7a67ca944ae5f16a03b2992e9f6989e5e831edc)
 
-diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
-index e933112..3868c21 100644
---- a/src/gui/dialogs/qfiledialog.cpp
-+++ b/src/gui/dialogs/qfiledialog.cpp
-@@ -58,7 +58,7 @@
- #include <qdebug.h>
- #include <qapplication.h>
- #include <qstylepainter.h>
--#include <itemviews/qfileiconprovider_p.h>
-+#include <private/qfileiconprovider_p.h>
- #if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN)
- #include "ui_qfiledialog.h"
- #else
--- 
-2.1.0
-
-
-From 06ddd1f936477c47566eba0b6ba184f523afca01 Mon Sep 17 00:00:00 2001
+From b56a4996a5babd1a6f5c97c826dfd9f38d128698 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 8 May 2014 00:24:25 +1000
-Subject: [PATCH 17/19] fix include path with current dir
+Subject: [PATCH 16/17] fix include path with current dir
 
 
 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro b/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
@@ -80665,13 +80636,13 @@ index 9e80870..4fa0ea2 100644
  CONFIG += console
 +INCLUDEPATH += .
 -- 
-2.1.0
+2.1.4
 
 
-From 884606e1ed5d6a9203d3e15404174341cd12aae2 Mon Sep 17 00:00:00 2001
+From 819d2791359bb5454c7a9350fbcbded092db4109 Mon Sep 17 00:00:00 2001
 From: Daniel Burr <dburr@topcon.com>
 Date: Mon, 1 Sep 2014 15:27:12 +0200
-Subject: [PATCH 18/19] qt dont perform ipc checks for win32
+Subject: [PATCH 17/17] qt dont perform ipc checks for win32
 
 Taken from:
 http://pkgs.fedoraproject.org/cgit/mingw-qt.git/plain/qt-dont-perform-ipc-checks-for-win32.patch?id2=HEAD
@@ -80683,10 +80654,10 @@ script"
 Change-Id: I066d52a5b0d3058793a65f95fad339f5785bfaa1
 
 diff --git a/configure b/configure
-index e1e7384..038a33c 100755
+index dee735b..14cf433 100755
 --- a/configure
 +++ b/configure
-@@ -5356,7 +5356,7 @@ if [ "$XPLATFORM_INTEGRITY" = "yes" ]; then
+@@ -5360,7 +5360,7 @@ if [ "$XPLATFORM_INTEGRITY" = "yes" ]; then
  fi
  
  # check IPC support
@@ -80696,46 +80667,5 @@ index e1e7384..038a33c 100755
      if ! compileTest unix/ipc_sysv "ipc_sysv" ; then
          # SYSV IPC is not supported - check POSIX IPC
 -- 
-2.1.0
-
-
-From c4585ae7d19378bfc58b2e813744ebe41997d36b Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore" <rich@kde.org>
-Date: Tue, 24 Feb 2015 19:02:35 +0000
-Subject: [PATCH 19/19] Fix a division by zero when processing malformed BMP
- files.
-
-This fixes a division by 0 when processing a maliciously crafted BMP
-file. No impact beyond DoS.
-
-Backport of 661f6bfd032dacc62841037732816a583640e187
-
-Task-number: QTBUG-44547
-Change-Id: I43f06e752b11cb50669101460902a82b885ae618
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry picked from commit e50aa2252cdd5cb53eef7d8c4503c7edff634f68)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index 8b047d8..39f3866 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -319,10 +319,16 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
--- 
-2.1.0
+2.1.4