update package qt

1 files changed, 173 insertions, 221 deletions

diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch
index e1ade97..967a035 100644
--- a/src/qt-1-cherrypicks.patch
+++ b/src/qt-1-cherrypicks.patch
@@ -5,10 +5,10 @@ Commits backported (cherry-picked) from upstream branch or merge requests.
 http://qt.gitorious.org/qt
 Also contains MXE specific fixes.
 
-From 26c66cfa7befc296f0c2196e4cc05f6fbc4ff927 Mon Sep 17 00:00:00 2001
+From 07dd00eda09c4d8bdad037fb0b47c5bc3c9c5b9c 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/16] remove trailing whitespace
+Subject: [PATCH 01/15] remove trailing whitespace
 
 backported from qt5/qtbase
 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
@@ -32,10 +32,10 @@ index 9090773..859ec8d 100644
 1.8.1.4
 
 
-From 55f1b97b2a5e81ab5cb619cc4534268c1b6b33b6 Mon Sep 17 00:00:00 2001
+From 2bb8b31ebc88fb0a59a8988e7ae3908211e41f87 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/16] do not detect or configure iconv for Windows
+Subject: [PATCH 02/15] 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
@@ -50,26 +50,26 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83)
 
 diff --git a/configure b/configure
-index e3d464b..699a35c 100755
+index 460b446..e337dc0 100755
 --- a/configure
 +++ b/configure
-@@ -5752,7 +5752,7 @@ fi
+@@ -5770,7 +5770,7 @@ fi
  
  # auto-detect iconv(3) support
  if [ "$CFG_ICONV" != "no" ]; then
 -    if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
 +    if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
          CFG_ICONV=no
-     elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
+     elif compileTest "unix/iconv" "POSIX iconv"; then
          CFG_ICONV=yes
 -- 
 1.8.1.4
 
 
-From f29250542c9d73b69ae4711d152811dca9e111ce Mon Sep 17 00:00:00 2001
+From a18496d765d41b43a44dc6596edb4d71847f9b90 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/16] fix whitespace
+Subject: [PATCH 03/15] fix whitespace
 
 backported from qt5/qtbase
 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
@@ -140,10 +140,10 @@ index 859ec8d..70cd890 100644
 1.8.1.4
 
 
-From 6858fb1d980c4121ea53eff9ecdb746cad0ea729 Mon Sep 17 00:00:00 2001
+From b412f830f448ee7ba5f364238d71a4b4072bbdbb 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/16] build and load text codecs regardless of iconv and
+Subject: [PATCH 04/15] build and load text codecs regardless of iconv and
  platform
 
 Otherwise applications linking to static Qt may have to import
@@ -224,7 +224,7 @@ index 70cd890..c847264 100644
  }
  symbian:LIBS += -lcharconv
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index ca5c879..780ff5d 100644
+index 7c513a0..517ac87 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -66,15 +66,14 @@
@@ -282,10 +282,10 @@ index ca5c879..780ff5d 100644
 1.8.1.4
 
 
-From 945790530a3461ba920eed32e65f32cddff7cc24 Mon Sep 17 00:00:00 2001
+From e3ee716ee2295eb6cb685a9d9c218179601a6795 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/16] move plugin text codecs to QtCore
+Subject: [PATCH 05/15] move plugin text codecs to QtCore
 
 Having plugin text codecs adds considerable complexity to
 configuring Qt. The plugin interface is designed for optional
@@ -363,13 +363,13 @@ 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..9fea76f
+index 0000000..a291677
 --- /dev/null
 +++ b/src/corelib/codecs/cp949codetbl_p.h
 @@ -0,0 +1,637 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -1006,13 +1006,13 @@ index 0000000..9fea76f
 +#endif // CP494CODETBL_H
 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
 new file mode 100644
-index 0000000..3018d5c
+index 0000000..0c673f8
 --- /dev/null
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -0,0 +1,12788 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -13800,13 +13800,13 @@ index 0000000..3018d5c
 +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..93f3dfb
+index 0000000..19f470c
 --- /dev/null
 +++ b/src/corelib/codecs/qbig5codec_p.h
 @@ -0,0 +1,124 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -13930,13 +13930,13 @@ index 0000000..93f3dfb
 +#endif // QBIG5CODEC_H
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
 new file mode 100644
-index 0000000..646b231
+index 0000000..2c68919
 --- /dev/null
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -0,0 +1,261 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -14197,13 +14197,13 @@ index 0000000..646b231
 +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..a42df14
+index 0000000..400cb03
 --- /dev/null
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -14309,13 +14309,13 @@ index 0000000..a42df14
 +#endif // QEUCJPCODEC_H
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
 new file mode 100644
-index 0000000..4181f10
+index 0000000..307b0f3
 --- /dev/null
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -0,0 +1,3571 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -17886,13 +17886,13 @@ index 0000000..4181f10
 +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..f05505e
+index 0000000..31c3b1b
 --- /dev/null
 +++ b/src/corelib/codecs/qeuckrcodec_p.h
 @@ -0,0 +1,129 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -18021,13 +18021,13 @@ index 0000000..f05505e
 +#endif // QEUCKRCODEC_H
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
 new file mode 100644
-index 0000000..ab21dce
+index 0000000..11917ed
 --- /dev/null
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -0,0 +1,145 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -18172,13 +18172,13 @@ index 0000000..ab21dce
 +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..d884cb7
+index 0000000..bedac58
 --- /dev/null
 +++ b/src/corelib/codecs/qfontjpcodec_p.h
 @@ -0,0 +1,93 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -18271,13 +18271,13 @@ index 0000000..d884cb7
 +#endif // QFONTJPCODEC_H
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
 new file mode 100644
-index 0000000..ed6a01a
+index 0000000..73d51fc
 --- /dev/null
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -0,0 +1,9265 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -27542,13 +27542,13 @@ index 0000000..ed6a01a
 +#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..62e4dc0
+index 0000000..5d231d5
 --- /dev/null
 +++ b/src/corelib/codecs/qgb18030codec_p.h
 @@ -0,0 +1,159 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -27707,13 +27707,13 @@ index 0000000..62e4dc0
 +#endif // QGB18030CODEC_H
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
 new file mode 100644
-index 0000000..28ead1a
+index 0000000..007dea1
 --- /dev/null
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -0,0 +1,367 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -28080,13 +28080,13 @@ index 0000000..28ead1a
 +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..59d73c9
+index 0000000..db2ce54
 --- /dev/null
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -28192,13 +28192,13 @@ index 0000000..59d73c9
 +#endif // QJISCODEC_H
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
 new file mode 100644
-index 0000000..b479f98
+index 0000000..fab366f
 --- /dev/null
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -0,0 +1,10700 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -38898,13 +38898,13 @@ index 0000000..b479f98
 +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..f2cb394
+index 0000000..1e7af75
 --- /dev/null
 +++ b/src/corelib/codecs/qjpunicode_p.h
 @@ -0,0 +1,174 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -39078,13 +39078,13 @@ index 0000000..f2cb394
 +#endif // QJPUNICODE_H
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
 new file mode 100644
-index 0000000..0c8c9d9
+index 0000000..aa4997f
 --- /dev/null
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -0,0 +1,229 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -39313,13 +39313,13 @@ index 0000000..0c8c9d9
 +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..c631dea
+index 0000000..054fbe5
 --- /dev/null
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -0,0 +1,106 @@
 +/****************************************************************************
 +**
-+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
++** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 +** Contact: http://www.qt-project.org/legal
 +**
 +** This file is part of the plugins of the Qt Toolkit.
@@ -39424,7 +39424,7 @@ index 0000000..c631dea
 +
 +#endif // QSJISCODEC_H
 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
-index 780ff5d..25edf90 100644
+index 517ac87..2eaff80 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -67,16 +67,16 @@
@@ -39475,13 +39475,13 @@ 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 0226c17..0000000
+index 9414e55..0000000
 --- a/src/plugins/codecs/cn/main.cpp
 +++ /dev/null
 @@ -1,145 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -39626,13 +39626,13 @@ index 0226c17..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 ed6a01a..0000000
+index 73d51fc..0000000
 --- a/src/plugins/codecs/cn/qgb18030codec.cpp
 +++ /dev/null
 @@ -1,9265 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -48897,13 +48897,13 @@ index ed6a01a..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 62e4dc0..0000000
+index 5d231d5..0000000
 --- a/src/plugins/codecs/cn/qgb18030codec.h
 +++ /dev/null
 @@ -1,159 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49105,13 +49105,13 @@ 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 89c16bf..0000000
+index 3e53fc8..0000000
 --- a/src/plugins/codecs/jp/main.cpp
 +++ /dev/null
 @@ -1,149 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49260,13 +49260,13 @@ index 89c16bf..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 646b231..0000000
+index 2c68919..0000000
 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp
 +++ /dev/null
 @@ -1,261 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49527,13 +49527,13 @@ index 646b231..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 a42df14..0000000
+index 400cb03..0000000
 --- a/src/plugins/codecs/jp/qeucjpcodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49639,13 +49639,13 @@ index a42df14..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 ab21dce..0000000
+index 11917ed..0000000
 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp
 +++ /dev/null
 @@ -1,145 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49790,13 +49790,13 @@ index ab21dce..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 d884cb7..0000000
+index bedac58..0000000
 --- a/src/plugins/codecs/jp/qfontjpcodec.h
 +++ /dev/null
 @@ -1,93 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -49889,13 +49889,13 @@ index d884cb7..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 28ead1a..0000000
+index 007dea1..0000000
 --- a/src/plugins/codecs/jp/qjiscodec.cpp
 +++ /dev/null
 @@ -1,367 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -50262,13 +50262,13 @@ index 28ead1a..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 59d73c9..0000000
+index db2ce54..0000000
 --- a/src/plugins/codecs/jp/qjiscodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -50374,13 +50374,13 @@ index 59d73c9..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 b479f98..0000000
+index fab366f..0000000
 --- a/src/plugins/codecs/jp/qjpunicode.cpp
 +++ /dev/null
 @@ -1,10700 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -61080,13 +61080,13 @@ index b479f98..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 f2cb394..0000000
+index 1e7af75..0000000
 --- a/src/plugins/codecs/jp/qjpunicode.h
 +++ /dev/null
 @@ -1,174 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -61260,13 +61260,13 @@ index f2cb394..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 0c8c9d9..0000000
+index aa4997f..0000000
 --- a/src/plugins/codecs/jp/qsjiscodec.cpp
 +++ /dev/null
 @@ -1,229 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -61495,13 +61495,13 @@ index 0c8c9d9..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 c631dea..0000000
+index 054fbe5..0000000
 --- a/src/plugins/codecs/jp/qsjiscodec.h
 +++ /dev/null
 @@ -1,106 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -61607,13 +61607,13 @@ index c631dea..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 9fea76f..0000000
+index a291677..0000000
 --- a/src/plugins/codecs/kr/cp949codetbl.h
 +++ /dev/null
 @@ -1,637 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -62276,13 +62276,13 @@ 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 2cae1ed..0000000
+index 87ccd6c..0000000
 --- a/src/plugins/codecs/kr/main.cpp
 +++ /dev/null
 @@ -1,131 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -62413,13 +62413,13 @@ index 2cae1ed..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 4181f10..0000000
+index 307b0f3..0000000
 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp
 +++ /dev/null
 @@ -1,3571 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -65990,13 +65990,13 @@ index 4181f10..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 f05505e..0000000
+index 31c3b1b..0000000
 --- a/src/plugins/codecs/kr/qeuckrcodec.h
 +++ /dev/null
 @@ -1,129 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -66125,13 +66125,13 @@ index f05505e..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 a5f9727..0000000
+index e12ad21..0000000
 --- a/src/plugins/codecs/tw/main.cpp
 +++ /dev/null
 @@ -1,138 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -66269,13 +66269,13 @@ index a5f9727..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 3018d5c..0000000
+index 0c673f8..0000000
 --- a/src/plugins/codecs/tw/qbig5codec.cpp
 +++ /dev/null
 @@ -1,12788 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79063,13 +79063,13 @@ index 3018d5c..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 93f3dfb..0000000
+index 19f470c..0000000
 --- a/src/plugins/codecs/tw/qbig5codec.h
 +++ /dev/null
 @@ -1,124 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79233,10 +79233,10 @@ index 94ce675..c4af49b 100644
 1.8.1.4
 
 
-From 804f0db4ce4f40bee7178dab70500032e2163e9c Mon Sep 17 00:00:00 2001
+From d92f8791dec8984c42613f623a5e48f1aeab1ebb 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/16] update private header references
+Subject: [PATCH 06/15] update private header references
 
 backported from qt5/qtbase
 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
@@ -79245,7 +79245,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 3018d5c..cb0ec89 100644
+index 0c673f8..ea3fe52 100644
 --- a/src/corelib/codecs/qbig5codec.cpp
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -39,7 +39,7 @@
@@ -79258,7 +79258,7 @@ index 3018d5c..cb0ec89 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
-index 646b231..11516dc 100644
+index 2c68919..64b5e8f 100644
 --- a/src/corelib/codecs/qeucjpcodec.cpp
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -73,7 +73,7 @@
@@ -79271,7 +79271,7 @@ index 646b231..11516dc 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
-index a42df14..5531a7a 100644
+index 400cb03..aa672fa 100644
 --- a/src/corelib/codecs/qeucjpcodec_p.h
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -71,7 +71,7 @@
@@ -79284,7 +79284,7 @@ index a42df14..5531a7a 100644
  #include <QtCore/qlist.h>
  
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
-index 4181f10..2722e9c 100644
+index 307b0f3..5e2daac 100644
 --- a/src/corelib/codecs/qeuckrcodec.cpp
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -65,8 +65,8 @@
@@ -79299,7 +79299,7 @@ index 4181f10..2722e9c 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
-index ab21dce..28da021 100644
+index 11917ed..3e62b7b 100644
 --- a/src/corelib/codecs/qfontjpcodec.cpp
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -39,9 +39,9 @@
@@ -79315,7 +79315,7 @@ index ab21dce..28da021 100644
  QT_BEGIN_NAMESPACE
  
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
-index ed6a01a..75e5639 100644
+index 73d51fc..091f9ce 100644
 --- a/src/corelib/codecs/qgb18030codec.cpp
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -44,7 +44,7 @@
@@ -79328,7 +79328,7 @@ index ed6a01a..75e5639 100644
  #ifndef QT_NO_TEXTCODEC
  
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
-index 28ead1a..ff2fbd8 100644
+index 007dea1..e11431f 100644
 --- a/src/corelib/codecs/qjiscodec.cpp
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -48,7 +48,7 @@
@@ -79341,7 +79341,7 @@ index 28ead1a..ff2fbd8 100644
  
  QT_BEGIN_NAMESPACE
 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
-index 59d73c9..b46e388 100644
+index db2ce54..7e0a2d7 100644
 --- a/src/corelib/codecs/qjiscodec_p.h
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -71,7 +71,7 @@
@@ -79354,7 +79354,7 @@ index 59d73c9..b46e388 100644
  #include <QtCore/qlist.h>
  
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
-index b479f98..bcc07f2 100644
+index fab366f..240af89 100644
 --- a/src/corelib/codecs/qjpunicode.cpp
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -44,7 +44,7 @@
@@ -79367,7 +79367,7 @@ index b479f98..bcc07f2 100644
  #include "qbytearray.h"
  #include <stdlib.h>
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
-index 0c8c9d9..b728267 100644
+index aa4997f..8519147 100644
 --- a/src/corelib/codecs/qsjiscodec.cpp
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -48,7 +48,7 @@
@@ -79380,7 +79380,7 @@ index 0c8c9d9..b728267 100644
  
  QT_BEGIN_NAMESPACE
 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
-index c631dea..e82efde 100644
+index 054fbe5..c1e4689 100644
 --- a/src/corelib/codecs/qsjiscodec_p.h
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -71,7 +71,7 @@
@@ -79396,10 +79396,10 @@ index c631dea..e82efde 100644
 1.8.1.4
 
 
-From b314e24c94453f7eca253e50f126f310e7467a67 Mon Sep 17 00:00:00 2001
+From 0f5e4515de61fe6c00a8a5169e65477f3e396025 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/16] cosmetic adjustments for files moved to core/codecs
+Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs
 
 -update old reference to 'plugin'
 -rename multiple inclusion guards
@@ -79412,11 +79412,11 @@ 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 9fea76f..bc77a34 100644
+index a291677..336b0b7 100644
 --- a/src/corelib/codecs/cp949codetbl_p.h
 +++ b/src/corelib/codecs/cp949codetbl_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79453,11 +79453,11 @@ index 9fea76f..bc77a34 100644
 -#endif // CP494CODETBL_H
 +#endif // CP494CODETBL_P_H
 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
-index cb0ec89..9861e5e 100644
+index ea3fe52..e55af06 100644
 --- a/src/corelib/codecs/qbig5codec.cpp
 +++ b/src/corelib/codecs/qbig5codec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79466,11 +79466,11 @@ index cb0ec89..9861e5e 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 93f3dfb..5dffc67 100644
+index 19f470c..9e1d678 100644
 --- a/src/corelib/codecs/qbig5codec_p.h
 +++ b/src/corelib/codecs/qbig5codec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79507,11 +79507,11 @@ index 93f3dfb..5dffc67 100644
 -#endif // QBIG5CODEC_H
 +#endif // QBIG5CODEC_P_H
 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
-index 11516dc..5c71139 100644
+index 64b5e8f..4466496 100644
 --- a/src/corelib/codecs/qeucjpcodec.cpp
 +++ b/src/corelib/codecs/qeucjpcodec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79520,11 +79520,11 @@ index 11516dc..5c71139 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 5531a7a..9e77507 100644
+index aa672fa..2102b71 100644
 --- a/src/corelib/codecs/qeucjpcodec_p.h
 +++ b/src/corelib/codecs/qeucjpcodec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79561,11 +79561,11 @@ index 5531a7a..9e77507 100644
 -#endif // QEUCJPCODEC_H
 +#endif // QEUCJPCODEC_P_H
 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
-index 2722e9c..a034d53 100644
+index 5e2daac..7a01ef7 100644
 --- a/src/corelib/codecs/qeuckrcodec.cpp
 +++ b/src/corelib/codecs/qeuckrcodec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79574,11 +79574,11 @@ index 2722e9c..a034d53 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 f05505e..ba73c0b 100644
+index 31c3b1b..e74b9c9 100644
 --- a/src/corelib/codecs/qeuckrcodec_p.h
 +++ b/src/corelib/codecs/qeuckrcodec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79615,11 +79615,11 @@ index f05505e..ba73c0b 100644
 -#endif // QEUCKRCODEC_H
 +#endif // QEUCKRCODEC_P_H
 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
-index 28da021..7e96ce3 100644
+index 3e62b7b..4b267bb 100644
 --- a/src/corelib/codecs/qfontjpcodec.cpp
 +++ b/src/corelib/codecs/qfontjpcodec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79628,11 +79628,11 @@ index 28da021..7e96ce3 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 d884cb7..96a2210 100644
+index bedac58..f8aa810 100644
 --- a/src/corelib/codecs/qfontjpcodec_p.h
 +++ b/src/corelib/codecs/qfontjpcodec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79669,11 +79669,11 @@ index d884cb7..96a2210 100644
 -#endif // QFONTJPCODEC_H
 +#endif // QFONTJPCODEC_P_H
 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
-index 75e5639..7cd66d9 100644
+index 091f9ce..cf60424 100644
 --- a/src/corelib/codecs/qgb18030codec.cpp
 +++ b/src/corelib/codecs/qgb18030codec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79682,11 +79682,11 @@ index 75e5639..7cd66d9 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 62e4dc0..13ef0fb 100644
+index 5d231d5..fe53d49 100644
 --- a/src/corelib/codecs/qgb18030codec_p.h
 +++ b/src/corelib/codecs/qgb18030codec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79723,11 +79723,11 @@ index 62e4dc0..13ef0fb 100644
 -#endif // QGB18030CODEC_H
 +#endif // QGB18030CODEC_P_H
 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
-index ff2fbd8..208fd0d 100644
+index e11431f..6135776 100644
 --- a/src/corelib/codecs/qjiscodec.cpp
 +++ b/src/corelib/codecs/qjiscodec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79736,11 +79736,11 @@ index ff2fbd8..208fd0d 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 b46e388..90c2c6b 100644
+index 7e0a2d7..e2b6cf2 100644
 --- a/src/corelib/codecs/qjiscodec_p.h
 +++ b/src/corelib/codecs/qjiscodec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79777,11 +79777,11 @@ index b46e388..90c2c6b 100644
 -#endif // QJISCODEC_H
 +#endif // QJISCODEC_P_H
 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
-index bcc07f2..d65860d 100644
+index 240af89..ffe6b3f 100644
 --- a/src/corelib/codecs/qjpunicode.cpp
 +++ b/src/corelib/codecs/qjpunicode.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79790,11 +79790,11 @@ index bcc07f2..d65860d 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 f2cb394..b8d6009 100644
+index 1e7af75..da45ceb 100644
 --- a/src/corelib/codecs/qjpunicode_p.h
 +++ b/src/corelib/codecs/qjpunicode_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79831,11 +79831,11 @@ index f2cb394..b8d6009 100644
 -#endif // QJPUNICODE_H
 +#endif // QJPUNICODE_P_H
 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
-index b728267..a1f71e7 100644
+index 8519147..fdb94f6 100644
 --- a/src/corelib/codecs/qsjiscodec.cpp
 +++ b/src/corelib/codecs/qsjiscodec.cpp
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79844,11 +79844,11 @@ index b728267..a1f71e7 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 e82efde..5c23ca4 100644
+index c1e4689..d5cbd74 100644
 --- a/src/corelib/codecs/qsjiscodec_p.h
 +++ b/src/corelib/codecs/qsjiscodec_p.h
 @@ -3,7 +3,7 @@
- ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
  ** Contact: http://www.qt-project.org/legal
  **
 -** This file is part of the plugins of the Qt Toolkit.
@@ -79888,10 +79888,10 @@ index e82efde..5c23ca4 100644
 1.8.1.4
 
 
-From 932c5edc9dd7eac3815b5802eec295b05382ab72 Mon Sep 17 00:00:00 2001
+From e8e977e321ab075cae6b4109868d6642b7e54548 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/16] remove obsolete codec plugin loading code
+Subject: [PATCH 08/15] remove obsolete codec plugin loading code
 
 backported from qt5/qtbase
 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
@@ -79934,7 +79934,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 25edf90..cdf47f7 100644
+index 2eaff80..85403dc 100644
 --- a/src/corelib/codecs/qtextcodec.cpp
 +++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -48,11 +48,6 @@
@@ -80082,13 +80082,13 @@ index 25edf90..cdf47f7 100644
  
 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp
 deleted file mode 100644
-index d4a8244..0000000
+index a2102f2..0000000
 --- a/src/corelib/codecs/qtextcodecplugin.cpp
 +++ /dev/null
 @@ -1,161 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the QtCore module of the Qt Toolkit.
@@ -80249,13 +80249,13 @@ index d4a8244..0000000
 -#endif // QT_NO_TEXTCODECPLUGIN
 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h
 deleted file mode 100644
-index e6bddd1..0000000
+index 8c7fae6..0000000
 --- a/src/corelib/codecs/qtextcodecplugin.h
 +++ /dev/null
 @@ -1,96 +0,0 @@
 -/****************************************************************************
 -**
--** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
 -**
 -** This file is part of the QtCore module of the Qt Toolkit.
@@ -80350,7 +80350,7 @@ index e6bddd1..0000000
 -
 -#endif // QTEXTCODECPLUGIN_H
 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
-index 38b4252..e85dbc6 100644
+index 5547736..60909d5 100644
 --- a/src/corelib/global/qconfig-medium.h
 +++ b/src/corelib/global/qconfig-medium.h
 @@ -91,9 +91,6 @@
@@ -80364,7 +80364,7 @@ index 38b4252..e85dbc6 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
-index be4b7f8..b564edf 100644
+index 36e3401..7edf746 100644
 --- a/src/corelib/global/qconfig-minimal.h
 +++ b/src/corelib/global/qconfig-minimal.h
 @@ -167,9 +167,6 @@
@@ -80378,7 +80378,7 @@ index be4b7f8..b564edf 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
-index 9073a78..b651ee1 100644
+index 446a98a..f760761 100644
 --- a/src/corelib/global/qconfig-nacl.h
 +++ b/src/corelib/global/qconfig-nacl.h
 @@ -128,9 +128,6 @@
@@ -80392,7 +80392,7 @@ index 9073a78..b651ee1 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
-index d96ee98..88cdf60 100644
+index 8e41875..f4d651b 100644
 --- a/src/corelib/global/qconfig-small.h
 +++ b/src/corelib/global/qconfig-small.h
 @@ -128,9 +128,6 @@
@@ -80406,7 +80406,7 @@ index d96ee98..88cdf60 100644
  #  define QT_NO_TRANSLATION
  #endif
 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
-index 04ac185..21838ed 100644
+index 1642947..36c09f1 100644
 --- a/src/corelib/global/qfeatures.h
 +++ b/src/corelib/global/qfeatures.h
 @@ -643,11 +643,6 @@
@@ -80425,10 +80425,10 @@ index 04ac185..21838ed 100644
 1.8.1.4
 
 
-From ace3dbf1f6946c16c2330e807637621be9c59dc7 Mon Sep 17 00:00:00 2001
+From ec1d708e71b87739fde04fcd480ea7317ff390a0 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/16] remove vestiges of text codec plugins
+Subject: [PATCH 09/15] remove vestiges of text codec plugins
 
 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
 
@@ -80459,10 +80459,10 @@ index dea05e0..12cd8ea 100644
 1.8.1.4
 
 
-From 48e5806ddbd8786c8e72e4835f10fdfb0038e84d Mon Sep 17 00:00:00 2001
+From f35eab15174376cf907517b7fa12468d84decd3c 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/16] use pkg-config for libmng (MXE specific)
+Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific)
 
 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
 
@@ -80485,10 +80485,10 @@ index ffb98de..6aab68f 100644
 1.8.1.4
 
 
-From f7ab3cc652a6b63bdff144563df93373379186f0 Mon Sep 17 00:00:00 2001
+From e8fb265680c5170fd3796d86fd2fea55c7dbf95e 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/16] use pkg-config for libtiff-4 (MXE specific)
+Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific)
 
 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
 
@@ -80511,10 +80511,10 @@ index e1cc3ee..71cbab1 100644
 1.8.1.4
 
 
-From 05452c3fadf80400e968df08fb073fe4a0723227 Mon Sep 17 00:00:00 2001
+From df24a20f268f023c1aa921366b59cf650cd71d92 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Sat, 5 Jun 2010 23:41:04 +0200
-Subject: [PATCH 12/16] restore support for static linking of QtWebKit (MXE
+Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE
  specific)
 
 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
@@ -80528,10 +80528,10 @@ Don't build Qt WebKit tests to avoid static linking problems.
 Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da
 
 diff --git a/configure b/configure
-index 699a35c..bad107a 100755
+index e337dc0..e54782e 100755
 --- a/configure
 +++ b/configure
-@@ -7749,12 +7749,6 @@ if [ "$CFG_GUI" = "no" ]; then
+@@ -7769,12 +7769,6 @@ if [ "$CFG_GUI" = "no" ]; then
      canBuildWebKit="no"
  fi
  
@@ -80614,10 +80614,10 @@ index 9be0f4a..6744f58 100644
 1.8.1.4
 
 
-From 8ef7f77bd3fb66152e466c5d110503c14f26a12d Mon Sep 17 00:00:00 2001
+From 67a99e7ba8cddb9257ea2d4b642191a40f70f931 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:47:10 +0200
-Subject: [PATCH 13/16] fix building on GNU/kFreeBSD (MXE specific)
+Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific)
 
 This patch has been taken from:
 
@@ -80629,7 +80629,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 8346e46..51aed78 100644
+index e914ede..d4d06c8 100644
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
@@ -80645,10 +80645,10 @@ index 8346e46..51aed78 100644
 1.8.1.4
 
 
-From be982852ea7a223296fa7aff352f6f5e99d18b9f Mon Sep 17 00:00:00 2001
+From 07cdc269228ef8a728392ce7eb973dda16507c08 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:49:47 +0200
-Subject: [PATCH 14/16] fix missing platform when building on GNU/kFreeBSD (MXE
+Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD (MXE
  specific)
 
 This patch is inspired by:
@@ -80659,10 +80659,10 @@ For the time being, glibc-g++ is simply a copy of linux-g++.
 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95
 
 diff --git a/configure b/configure
-index bad107a..9aa9126 100755
+index e54782e..707f55a 100755
 --- a/configure
 +++ b/configure
-@@ -2871,6 +2871,9 @@ if [ -z "$PLATFORM" ]; then
+@@ -2877,6 +2877,9 @@ if [ -z "$PLATFORM" ]; then
       GNU:*)
          PLATFORM=hurd-g++
          ;;
@@ -80676,10 +80676,10 @@ index bad107a..9aa9126 100755
 1.8.1.4
 
 
-From 85989caf16b4e60e66e790988302243c5f5e12eb Mon Sep 17 00:00:00 2001
+From 9be5f8ccf1d4664f9b799696c5c343be65bde5d4 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Thu, 1 Sep 2011 13:51:50 +0200
-Subject: [PATCH 15/16] fix building on dragonfly (MXE specific)
+Subject: [PATCH 15/15] 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
@@ -80687,10 +80687,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 9aa9126..8643338 100755
+index 707f55a..8c48f51 100755
 --- a/configure
 +++ b/configure
-@@ -2883,7 +2883,7 @@ if [ -z "$PLATFORM" ]; then
+@@ -2889,7 +2889,7 @@ if [ -z "$PLATFORM" ]; then
       ULTRIX:*)
          PLATFORM=ultrix-g++
          ;;
@@ -80702,51 +80702,3 @@ index 9aa9126..8643338 100755
 -- 
 1.8.1.4
 
-
-From 2c09dcd265e95d618be390263569f9f2c2ca01ac Mon Sep 17 00:00:00 2001
-From: Matt Fischer <matt.fischer@garmin.com>
-Date: Thu, 28 Feb 2013 10:52:12 -0600
-Subject: [PATCH 16/16] Fixed -dbus-linked when cross-compiling from Windows
-
-Since Windows doesn't have pkg-config, it doesn't get -ldbus-1
-added to the command line automatically like Linux does.  Code
-was present to deal with this case, however it was only configured
-to work when native-compiling Qt.  The flag was not added when
-cross-compiling, meaning that -dbus-linked did not work correctly
-in that case.  This patch changes the code to add the flag properly
-in both cases.
-
-Change-Id: I67881643bd658161f4929f3932859ccf636ca7a9
-Task-number: QTBUG-29984
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-(cherry-picked from qtbase/c82b0815ec80b3750a110d47c68142bb448ddf56)
-
-diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
-index 37e5925..56527ad 100644
---- a/src/dbus/dbus.pro
-+++ b/src/dbus/dbus.pro
-@@ -6,6 +6,12 @@ CONFIG += link_pkgconfig
- DEFINES += QT_BUILD_DBUS_LIB \
-     DBUS_API_SUBJECT_TO_CHANGE
- QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
-+
-+isEmpty(QT_LIBS_DBUS) {
-+    win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
-+    else:QT_LIBS_DBUS += -ldbus-1
-+}
-+
- contains(QT_CONFIG, dbus-linked) { 
-     LIBS_PRIVATE += $$QT_LIBS_DBUS
-     DEFINES += QT_LINKED_LIBDBUS
-@@ -25,8 +31,6 @@ win32 {
-         -ladvapi32 \
-         -lnetapi32 \
-         -luser32
--    CONFIG(debug, debug|release):LIBS_PRIVATE += -ldbus-1d
--    else:LIBS_PRIVATE += -ldbus-1
- }
- include(../qbase.pri)
- PUB_HEADERS = qdbusargument.h \
--- 
-1.8.1.4
-