Mercurial > mxe-octave

comparison src/qt-1-cherrypicks.patch @ 3594:30f4b78227af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dbus update to 1.8.2, qt update to 4.8.6. * src/dbus.mk: update to version 1.8.2. * src/qt-1-cherrypicks.patch: update from latest mxe devel. * src/qt.mk: update to version 4.8.6.
author John Donoghue
date Tue, 13 May 2014 16:52:21 -0400
parents 90e45130eab8
children e576d2d5ae70
comparison
equal deleted inserted replaced
3593:9a78c7c94ba8 3594:30f4b78227af
2 See index.html for further information. 2 See index.html for further information.
3 3
4 Commits backported (cherry-picked) from upstream branch or merge requests. 4 Commits backported (cherry-picked) from upstream branch or merge requests.
5 http://qt.gitorious.org/qt 5 http://qt.gitorious.org/qt
6 Also contains MXE specific fixes. 6 Also contains MXE specific fixes.
7 From 6dfcbf0d99d76dbade4e3b427c9826e171382ca4 Mon Sep 17 00:00:00 2001 7 From 0739b3c86b95eae282113c15800e1840eb3027f1 Mon Sep 17 00:00:00 2001
8 From: Mark Brand <mabrand@mabrand.nl> 8 From: Mark Brand <mabrand@mabrand.nl>
9 Date: Fri, 13 Jan 2012 00:17:48 +0100 9 Date: Fri, 13 Jan 2012 00:17:48 +0100
10 Subject: [PATCH 01/17] remove trailing whitespace 10 Subject: [PATCH 01/17] remove trailing whitespace
11 11
12 backported from qt5/qtbase 12 backported from qt5/qtbase
26 + ../plugins/codecs/jp/qsjiscodec.h \ 26 + ../plugins/codecs/jp/qsjiscodec.h \
27 ../plugins/codecs/kr/qeuckrcodec.h \ 27 ../plugins/codecs/kr/qeuckrcodec.h \
28 ../plugins/codecs/tw/qbig5codec.h \ 28 ../plugins/codecs/tw/qbig5codec.h \
29 ../plugins/codecs/jp/qfontjpcodec.h 29 ../plugins/codecs/jp/qfontjpcodec.h
30 -- 30 --
31 1.8.1.4 31 1.8.5.2 (Apple Git-48)
32 32
33 33
34 From f35425afd4ab61c9d5b806223d58292aa519997b Mon Sep 17 00:00:00 2001 34 From 32c83f9219a8300d8949622dbb946ca60bc50359 Mon Sep 17 00:00:00 2001
35 From: Mark Brand <mabrand@mabrand.nl> 35 From: Mark Brand <mabrand@mabrand.nl>
36 Date: Thu, 30 Jun 2011 10:22:33 +0200 36 Date: Thu, 30 Jun 2011 10:22:33 +0200
37 Subject: [PATCH 02/17] do not detect or configure iconv for Windows 37 Subject: [PATCH 02/17] do not detect or configure iconv for Windows
38 38
39 Qt doesn't use iconv on Windows, but configuring it will appear to 39 Qt doesn't use iconv on Windows, but configuring it will appear to
47 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 47 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
48 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 48 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
49 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83) 49 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83)
50 50
51 diff --git a/configure b/configure 51 diff --git a/configure b/configure
52 index 460b446..e337dc0 100755 52 index a9ba7c8..2e495a4 100755
53 --- a/configure 53 --- a/configure
54 +++ b/configure 54 +++ b/configure
55 @@ -5770,7 +5770,7 @@ fi 55 @@ -5810,7 +5810,7 @@ fi
56 56
57 # auto-detect iconv(3) support 57 # auto-detect iconv(3) support
58 if [ "$CFG_ICONV" != "no" ]; then 58 if [ "$CFG_ICONV" != "no" ]; then
59 - if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then 59 - if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
60 + if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then 60 + if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
61 CFG_ICONV=no 61 CFG_ICONV=no
62 elif compileTest "unix/iconv" "POSIX iconv"; then 62 elif compileTest "unix/iconv" "POSIX iconv"; then
63 CFG_ICONV=yes 63 CFG_ICONV=yes
64 -- 64 --
65 1.8.1.4 65 1.8.5.2 (Apple Git-48)
66 66
67 67
68 From 4dcf10f5beed5fbe74201f06a750bf18643dd716 Mon Sep 17 00:00:00 2001 68 From 595e8d4d50d792cfc644c665763ec425ec746e56 Mon Sep 17 00:00:00 2001
69 From: Mark Brand <mabrand@mabrand.nl> 69 From: Mark Brand <mabrand@mabrand.nl>
70 Date: Wed, 18 Jan 2012 11:43:10 +0100 70 Date: Wed, 18 Jan 2012 11:43:10 +0100
71 Subject: [PATCH 03/17] fix whitespace 71 Subject: [PATCH 03/17] fix whitespace
72 72
73 backported from qt5/qtbase 73 backported from qt5/qtbase
134 + ../plugins/codecs/jp/qsjiscodec.cpp \ 134 + ../plugins/codecs/jp/qsjiscodec.cpp \
135 ../plugins/codecs/kr/qeuckrcodec.cpp \ 135 ../plugins/codecs/kr/qeuckrcodec.cpp \
136 ../plugins/codecs/tw/qbig5codec.cpp \ 136 ../plugins/codecs/tw/qbig5codec.cpp \
137 ../plugins/codecs/jp/qfontjpcodec.cpp 137 ../plugins/codecs/jp/qfontjpcodec.cpp
138 -- 138 --
139 1.8.1.4 139 1.8.5.2 (Apple Git-48)
140 140
141 141
142 From b3bf93f2b38902cabdd203ad0362e3a90977e118 Mon Sep 17 00:00:00 2001 142 From d91e9ac5812dd55be30ac2649e091e7a275e4653 Mon Sep 17 00:00:00 2001
143 From: Mark Brand <mabrand@mabrand.nl> 143 From: Mark Brand <mabrand@mabrand.nl>
144 Date: Mon, 4 Jul 2011 00:42:24 +0200 144 Date: Mon, 4 Jul 2011 00:42:24 +0200
145 Subject: [PATCH 04/17] build and load text codecs regardless of iconv and 145 Subject: [PATCH 04/17] build and load text codecs regardless of iconv and
146 platform 146 platform
147 147
221 - ../plugins/codecs/jp/qfontjpcodec.cpp 221 - ../plugins/codecs/jp/qfontjpcodec.cpp
222 } 222 }
223 } 223 }
224 symbian:LIBS += -lcharconv 224 symbian:LIBS += -lcharconv
225 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 225 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
226 index 7c513a0..517ac87 100644 226 index 58ffb00..1ee586e 100644
227 --- a/src/corelib/codecs/qtextcodec.cpp 227 --- a/src/corelib/codecs/qtextcodec.cpp
228 +++ b/src/corelib/codecs/qtextcodec.cpp 228 +++ b/src/corelib/codecs/qtextcodec.cpp
229 @@ -66,15 +66,14 @@ 229 @@ -66,15 +66,14 @@
230 # include "qtsciicodec_p.h" 230 # include "qtsciicodec_p.h"
231 # include "qisciicodec_p.h" 231 # include "qisciicodec_p.h"
276 +# endif // !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS 276 +# endif // !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS
277 #endif //Q_OS_SYMBIAN 277 #endif //Q_OS_SYMBIAN
278 #endif // QT_NO_CODECS 278 #endif // QT_NO_CODECS
279 279
280 -- 280 --
281 1.8.1.4 281 1.8.5.2 (Apple Git-48)
282 282
283 283
284 From 73d43da5b39105d52511036c3bef3a391d0f19ae Mon Sep 17 00:00:00 2001 284 From 1fc30f6f3fe9351907016c2dec74b0114be64619 Mon Sep 17 00:00:00 2001
285 From: Mark Brand <mabrand@mabrand.nl> 285 From: Mark Brand <mabrand@mabrand.nl>
286 Date: Fri, 13 Jan 2012 00:24:13 +0100 286 Date: Fri, 13 Jan 2012 00:24:13 +0100
287 Subject: [PATCH 05/17] move plugin text codecs to QtCore 287 Subject: [PATCH 05/17] move plugin text codecs to QtCore
288 288
289 Having plugin text codecs adds considerable complexity to 289 Having plugin text codecs adds considerable complexity to
360 360
361 unix { 361 unix {
362 SOURCES += codecs/qfontlaocodec.cpp 362 SOURCES += codecs/qfontlaocodec.cpp
363 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h 363 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
364 new file mode 100644 364 new file mode 100644
365 index 0000000..a291677 365 index 0000000..7e1af4e
366 --- /dev/null 366 --- /dev/null
367 +++ b/src/corelib/codecs/cp949codetbl_p.h 367 +++ b/src/corelib/codecs/cp949codetbl_p.h
368 @@ -0,0 +1,637 @@ 368 @@ -0,0 +1,637 @@
369 +/**************************************************************************** 369 +/****************************************************************************
370 +** 370 +**
371 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 371 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
372 +** Contact: http://www.qt-project.org/legal 372 +** Contact: http://www.qt-project.org/legal
373 +** 373 +**
374 +** This file is part of the plugins of the Qt Toolkit. 374 +** This file is part of the plugins of the Qt Toolkit.
375 +** 375 +**
376 +** $QT_BEGIN_LICENSE:LGPL$ 376 +** $QT_BEGIN_LICENSE:LGPL$
1003 +}; 1003 +};
1004 + 1004 +
1005 +#endif // CP494CODETBL_H 1005 +#endif // CP494CODETBL_H
1006 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 1006 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
1007 new file mode 100644 1007 new file mode 100644
1008 index 0000000..0c673f8 1008 index 0000000..2d37f56
1009 --- /dev/null 1009 --- /dev/null
1010 +++ b/src/corelib/codecs/qbig5codec.cpp 1010 +++ b/src/corelib/codecs/qbig5codec.cpp
1011 @@ -0,0 +1,12788 @@ 1011 @@ -0,0 +1,12788 @@
1012 +/**************************************************************************** 1012 +/****************************************************************************
1013 +** 1013 +**
1014 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 1014 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
1015 +** Contact: http://www.qt-project.org/legal 1015 +** Contact: http://www.qt-project.org/legal
1016 +** 1016 +**
1017 +** This file is part of the plugins of the Qt Toolkit. 1017 +** This file is part of the plugins of the Qt Toolkit.
1018 +** 1018 +**
1019 +** $QT_BEGIN_LICENSE:LGPL$ 1019 +** $QT_BEGIN_LICENSE:LGPL$
13797 +#endif // QT_NO_TEXTCODEC 13797 +#endif // QT_NO_TEXTCODEC
13798 + 13798 +
13799 +QT_END_NAMESPACE 13799 +QT_END_NAMESPACE
13800 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h 13800 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
13801 new file mode 100644 13801 new file mode 100644
13802 index 0000000..19f470c 13802 index 0000000..334764c
13803 --- /dev/null 13803 --- /dev/null
13804 +++ b/src/corelib/codecs/qbig5codec_p.h 13804 +++ b/src/corelib/codecs/qbig5codec_p.h
13805 @@ -0,0 +1,124 @@ 13805 @@ -0,0 +1,124 @@
13806 +/**************************************************************************** 13806 +/****************************************************************************
13807 +** 13807 +**
13808 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 13808 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
13809 +** Contact: http://www.qt-project.org/legal 13809 +** Contact: http://www.qt-project.org/legal
13810 +** 13810 +**
13811 +** This file is part of the plugins of the Qt Toolkit. 13811 +** This file is part of the plugins of the Qt Toolkit.
13812 +** 13812 +**
13813 +** $QT_BEGIN_LICENSE:LGPL$ 13813 +** $QT_BEGIN_LICENSE:LGPL$
13927 +QT_END_NAMESPACE 13927 +QT_END_NAMESPACE
13928 + 13928 +
13929 +#endif // QBIG5CODEC_H 13929 +#endif // QBIG5CODEC_H
13930 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 13930 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
13931 new file mode 100644 13931 new file mode 100644
13932 index 0000000..2c68919 13932 index 0000000..6e1be4a
13933 --- /dev/null 13933 --- /dev/null
13934 +++ b/src/corelib/codecs/qeucjpcodec.cpp 13934 +++ b/src/corelib/codecs/qeucjpcodec.cpp
13935 @@ -0,0 +1,261 @@ 13935 @@ -0,0 +1,261 @@
13936 +/**************************************************************************** 13936 +/****************************************************************************
13937 +** 13937 +**
13938 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 13938 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
13939 +** Contact: http://www.qt-project.org/legal 13939 +** Contact: http://www.qt-project.org/legal
13940 +** 13940 +**
13941 +** This file is part of the plugins of the Qt Toolkit. 13941 +** This file is part of the plugins of the Qt Toolkit.
13942 +** 13942 +**
13943 +** $QT_BEGIN_LICENSE:LGPL$ 13943 +** $QT_BEGIN_LICENSE:LGPL$
14194 +#endif // QT_NO_TEXTCODEC 14194 +#endif // QT_NO_TEXTCODEC
14195 + 14195 +
14196 +QT_END_NAMESPACE 14196 +QT_END_NAMESPACE
14197 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 14197 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
14198 new file mode 100644 14198 new file mode 100644
14199 index 0000000..400cb03 14199 index 0000000..bc3cbc7
14200 --- /dev/null 14200 --- /dev/null
14201 +++ b/src/corelib/codecs/qeucjpcodec_p.h 14201 +++ b/src/corelib/codecs/qeucjpcodec_p.h
14202 @@ -0,0 +1,106 @@ 14202 @@ -0,0 +1,106 @@
14203 +/**************************************************************************** 14203 +/****************************************************************************
14204 +** 14204 +**
14205 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 14205 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
14206 +** Contact: http://www.qt-project.org/legal 14206 +** Contact: http://www.qt-project.org/legal
14207 +** 14207 +**
14208 +** This file is part of the plugins of the Qt Toolkit. 14208 +** This file is part of the plugins of the Qt Toolkit.
14209 +** 14209 +**
14210 +** $QT_BEGIN_LICENSE:LGPL$ 14210 +** $QT_BEGIN_LICENSE:LGPL$
14306 +QT_END_NAMESPACE 14306 +QT_END_NAMESPACE
14307 + 14307 +
14308 +#endif // QEUCJPCODEC_H 14308 +#endif // QEUCJPCODEC_H
14309 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 14309 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
14310 new file mode 100644 14310 new file mode 100644
14311 index 0000000..307b0f3 14311 index 0000000..cb51181
14312 --- /dev/null 14312 --- /dev/null
14313 +++ b/src/corelib/codecs/qeuckrcodec.cpp 14313 +++ b/src/corelib/codecs/qeuckrcodec.cpp
14314 @@ -0,0 +1,3571 @@ 14314 @@ -0,0 +1,3571 @@
14315 +/**************************************************************************** 14315 +/****************************************************************************
14316 +** 14316 +**
14317 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 14317 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
14318 +** Contact: http://www.qt-project.org/legal 14318 +** Contact: http://www.qt-project.org/legal
14319 +** 14319 +**
14320 +** This file is part of the plugins of the Qt Toolkit. 14320 +** This file is part of the plugins of the Qt Toolkit.
14321 +** 14321 +**
14322 +** $QT_BEGIN_LICENSE:LGPL$ 14322 +** $QT_BEGIN_LICENSE:LGPL$
17883 +#endif // QT_NO_TEXTCODEC 17883 +#endif // QT_NO_TEXTCODEC
17884 + 17884 +
17885 +QT_END_NAMESPACE 17885 +QT_END_NAMESPACE
17886 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h 17886 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
17887 new file mode 100644 17887 new file mode 100644
17888 index 0000000..31c3b1b 17888 index 0000000..c7a9b15
17889 --- /dev/null 17889 --- /dev/null
17890 +++ b/src/corelib/codecs/qeuckrcodec_p.h 17890 +++ b/src/corelib/codecs/qeuckrcodec_p.h
17891 @@ -0,0 +1,129 @@ 17891 @@ -0,0 +1,129 @@
17892 +/**************************************************************************** 17892 +/****************************************************************************
17893 +** 17893 +**
17894 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 17894 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
17895 +** Contact: http://www.qt-project.org/legal 17895 +** Contact: http://www.qt-project.org/legal
17896 +** 17896 +**
17897 +** This file is part of the plugins of the Qt Toolkit. 17897 +** This file is part of the plugins of the Qt Toolkit.
17898 +** 17898 +**
17899 +** $QT_BEGIN_LICENSE:LGPL$ 17899 +** $QT_BEGIN_LICENSE:LGPL$
18018 +QT_END_NAMESPACE 18018 +QT_END_NAMESPACE
18019 + 18019 +
18020 +#endif // QEUCKRCODEC_H 18020 +#endif // QEUCKRCODEC_H
18021 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 18021 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
18022 new file mode 100644 18022 new file mode 100644
18023 index 0000000..11917ed 18023 index 0000000..d5139aa
18024 --- /dev/null 18024 --- /dev/null
18025 +++ b/src/corelib/codecs/qfontjpcodec.cpp 18025 +++ b/src/corelib/codecs/qfontjpcodec.cpp
18026 @@ -0,0 +1,145 @@ 18026 @@ -0,0 +1,145 @@
18027 +/**************************************************************************** 18027 +/****************************************************************************
18028 +** 18028 +**
18029 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 18029 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
18030 +** Contact: http://www.qt-project.org/legal 18030 +** Contact: http://www.qt-project.org/legal
18031 +** 18031 +**
18032 +** This file is part of the plugins of the Qt Toolkit. 18032 +** This file is part of the plugins of the Qt Toolkit.
18033 +** 18033 +**
18034 +** $QT_BEGIN_LICENSE:LGPL$ 18034 +** $QT_BEGIN_LICENSE:LGPL$
18169 +#endif 18169 +#endif
18170 + 18170 +
18171 +QT_END_NAMESPACE 18171 +QT_END_NAMESPACE
18172 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h 18172 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
18173 new file mode 100644 18173 new file mode 100644
18174 index 0000000..bedac58 18174 index 0000000..e905cd1
18175 --- /dev/null 18175 --- /dev/null
18176 +++ b/src/corelib/codecs/qfontjpcodec_p.h 18176 +++ b/src/corelib/codecs/qfontjpcodec_p.h
18177 @@ -0,0 +1,93 @@ 18177 @@ -0,0 +1,93 @@
18178 +/**************************************************************************** 18178 +/****************************************************************************
18179 +** 18179 +**
18180 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 18180 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
18181 +** Contact: http://www.qt-project.org/legal 18181 +** Contact: http://www.qt-project.org/legal
18182 +** 18182 +**
18183 +** This file is part of the plugins of the Qt Toolkit. 18183 +** This file is part of the plugins of the Qt Toolkit.
18184 +** 18184 +**
18185 +** $QT_BEGIN_LICENSE:LGPL$ 18185 +** $QT_BEGIN_LICENSE:LGPL$
18268 +QT_END_NAMESPACE 18268 +QT_END_NAMESPACE
18269 + 18269 +
18270 +#endif // QFONTJPCODEC_H 18270 +#endif // QFONTJPCODEC_H
18271 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 18271 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
18272 new file mode 100644 18272 new file mode 100644
18273 index 0000000..73d51fc 18273 index 0000000..06345ff
18274 --- /dev/null 18274 --- /dev/null
18275 +++ b/src/corelib/codecs/qgb18030codec.cpp 18275 +++ b/src/corelib/codecs/qgb18030codec.cpp
18276 @@ -0,0 +1,9265 @@ 18276 @@ -0,0 +1,9265 @@
18277 +/**************************************************************************** 18277 +/****************************************************************************
18278 +** 18278 +**
18279 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 18279 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
18280 +** Contact: http://www.qt-project.org/legal 18280 +** Contact: http://www.qt-project.org/legal
18281 +** 18281 +**
18282 +** This file is part of the plugins of the Qt Toolkit. 18282 +** This file is part of the plugins of the Qt Toolkit.
18283 +** 18283 +**
18284 +** $QT_BEGIN_LICENSE:LGPL$ 18284 +** $QT_BEGIN_LICENSE:LGPL$
27539 +QT_END_NAMESPACE 27539 +QT_END_NAMESPACE
27540 + 27540 +
27541 +#endif // QT_NO_TEXTCODEC 27541 +#endif // QT_NO_TEXTCODEC
27542 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h 27542 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
27543 new file mode 100644 27543 new file mode 100644
27544 index 0000000..5d231d5 27544 index 0000000..e3dd386
27545 --- /dev/null 27545 --- /dev/null
27546 +++ b/src/corelib/codecs/qgb18030codec_p.h 27546 +++ b/src/corelib/codecs/qgb18030codec_p.h
27547 @@ -0,0 +1,159 @@ 27547 @@ -0,0 +1,159 @@
27548 +/**************************************************************************** 27548 +/****************************************************************************
27549 +** 27549 +**
27550 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 27550 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
27551 +** Contact: http://www.qt-project.org/legal 27551 +** Contact: http://www.qt-project.org/legal
27552 +** 27552 +**
27553 +** This file is part of the plugins of the Qt Toolkit. 27553 +** This file is part of the plugins of the Qt Toolkit.
27554 +** 27554 +**
27555 +** $QT_BEGIN_LICENSE:LGPL$ 27555 +** $QT_BEGIN_LICENSE:LGPL$
27704 +QT_END_NAMESPACE 27704 +QT_END_NAMESPACE
27705 + 27705 +
27706 +#endif // QGB18030CODEC_H 27706 +#endif // QGB18030CODEC_H
27707 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 27707 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
27708 new file mode 100644 27708 new file mode 100644
27709 index 0000000..007dea1 27709 index 0000000..2c9be691
27710 --- /dev/null 27710 --- /dev/null
27711 +++ b/src/corelib/codecs/qjiscodec.cpp 27711 +++ b/src/corelib/codecs/qjiscodec.cpp
27712 @@ -0,0 +1,367 @@ 27712 @@ -0,0 +1,367 @@
27713 +/**************************************************************************** 27713 +/****************************************************************************
27714 +** 27714 +**
27715 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 27715 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
27716 +** Contact: http://www.qt-project.org/legal 27716 +** Contact: http://www.qt-project.org/legal
27717 +** 27717 +**
27718 +** This file is part of the plugins of the Qt Toolkit. 27718 +** This file is part of the plugins of the Qt Toolkit.
27719 +** 27719 +**
27720 +** $QT_BEGIN_LICENSE:LGPL$ 27720 +** $QT_BEGIN_LICENSE:LGPL$
28077 +#endif // QT_NO_TEXTCODEC 28077 +#endif // QT_NO_TEXTCODEC
28078 + 28078 +
28079 +QT_END_NAMESPACE 28079 +QT_END_NAMESPACE
28080 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 28080 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
28081 new file mode 100644 28081 new file mode 100644
28082 index 0000000..db2ce54 28082 index 0000000..f6ba975
28083 --- /dev/null 28083 --- /dev/null
28084 +++ b/src/corelib/codecs/qjiscodec_p.h 28084 +++ b/src/corelib/codecs/qjiscodec_p.h
28085 @@ -0,0 +1,106 @@ 28085 @@ -0,0 +1,106 @@
28086 +/**************************************************************************** 28086 +/****************************************************************************
28087 +** 28087 +**
28088 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 28088 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
28089 +** Contact: http://www.qt-project.org/legal 28089 +** Contact: http://www.qt-project.org/legal
28090 +** 28090 +**
28091 +** This file is part of the plugins of the Qt Toolkit. 28091 +** This file is part of the plugins of the Qt Toolkit.
28092 +** 28092 +**
28093 +** $QT_BEGIN_LICENSE:LGPL$ 28093 +** $QT_BEGIN_LICENSE:LGPL$
28189 +QT_END_NAMESPACE 28189 +QT_END_NAMESPACE
28190 + 28190 +
28191 +#endif // QJISCODEC_H 28191 +#endif // QJISCODEC_H
28192 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 28192 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
28193 new file mode 100644 28193 new file mode 100644
28194 index 0000000..fab366f 28194 index 0000000..66f2e34
28195 --- /dev/null 28195 --- /dev/null
28196 +++ b/src/corelib/codecs/qjpunicode.cpp 28196 +++ b/src/corelib/codecs/qjpunicode.cpp
28197 @@ -0,0 +1,10700 @@ 28197 @@ -0,0 +1,10700 @@
28198 +/**************************************************************************** 28198 +/****************************************************************************
28199 +** 28199 +**
28200 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 28200 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
28201 +** Contact: http://www.qt-project.org/legal 28201 +** Contact: http://www.qt-project.org/legal
28202 +** 28202 +**
28203 +** This file is part of the plugins of the Qt Toolkit. 28203 +** This file is part of the plugins of the Qt Toolkit.
28204 +** 28204 +**
28205 +** $QT_BEGIN_LICENSE:LGPL$ 28205 +** $QT_BEGIN_LICENSE:LGPL$
38895 +*/ 38895 +*/
38896 + 38896 +
38897 +QT_END_NAMESPACE 38897 +QT_END_NAMESPACE
38898 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h 38898 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
38899 new file mode 100644 38899 new file mode 100644
38900 index 0000000..1e7af75 38900 index 0000000..83bb8e1
38901 --- /dev/null 38901 --- /dev/null
38902 +++ b/src/corelib/codecs/qjpunicode_p.h 38902 +++ b/src/corelib/codecs/qjpunicode_p.h
38903 @@ -0,0 +1,174 @@ 38903 @@ -0,0 +1,174 @@
38904 +/**************************************************************************** 38904 +/****************************************************************************
38905 +** 38905 +**
38906 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 38906 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
38907 +** Contact: http://www.qt-project.org/legal 38907 +** Contact: http://www.qt-project.org/legal
38908 +** 38908 +**
38909 +** This file is part of the plugins of the Qt Toolkit. 38909 +** This file is part of the plugins of the Qt Toolkit.
38910 +** 38910 +**
38911 +** $QT_BEGIN_LICENSE:LGPL$ 38911 +** $QT_BEGIN_LICENSE:LGPL$
39075 +QT_END_NAMESPACE 39075 +QT_END_NAMESPACE
39076 + 39076 +
39077 +#endif // QJPUNICODE_H 39077 +#endif // QJPUNICODE_H
39078 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 39078 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
39079 new file mode 100644 39079 new file mode 100644
39080 index 0000000..aa4997f 39080 index 0000000..977f38f
39081 --- /dev/null 39081 --- /dev/null
39082 +++ b/src/corelib/codecs/qsjiscodec.cpp 39082 +++ b/src/corelib/codecs/qsjiscodec.cpp
39083 @@ -0,0 +1,229 @@ 39083 @@ -0,0 +1,229 @@
39084 +/**************************************************************************** 39084 +/****************************************************************************
39085 +** 39085 +**
39086 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 39086 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
39087 +** Contact: http://www.qt-project.org/legal 39087 +** Contact: http://www.qt-project.org/legal
39088 +** 39088 +**
39089 +** This file is part of the plugins of the Qt Toolkit. 39089 +** This file is part of the plugins of the Qt Toolkit.
39090 +** 39090 +**
39091 +** $QT_BEGIN_LICENSE:LGPL$ 39091 +** $QT_BEGIN_LICENSE:LGPL$
39310 +#endif // QT_NO_TEXTCODEC 39310 +#endif // QT_NO_TEXTCODEC
39311 + 39311 +
39312 +QT_END_NAMESPACE 39312 +QT_END_NAMESPACE
39313 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 39313 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
39314 new file mode 100644 39314 new file mode 100644
39315 index 0000000..054fbe5 39315 index 0000000..a4c0981
39316 --- /dev/null 39316 --- /dev/null
39317 +++ b/src/corelib/codecs/qsjiscodec_p.h 39317 +++ b/src/corelib/codecs/qsjiscodec_p.h
39318 @@ -0,0 +1,106 @@ 39318 @@ -0,0 +1,106 @@
39319 +/**************************************************************************** 39319 +/****************************************************************************
39320 +** 39320 +**
39321 +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 39321 +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
39322 +** Contact: http://www.qt-project.org/legal 39322 +** Contact: http://www.qt-project.org/legal
39323 +** 39323 +**
39324 +** This file is part of the plugins of the Qt Toolkit. 39324 +** This file is part of the plugins of the Qt Toolkit.
39325 +** 39325 +**
39326 +** $QT_BEGIN_LICENSE:LGPL$ 39326 +** $QT_BEGIN_LICENSE:LGPL$
39421 + 39421 +
39422 +QT_END_NAMESPACE 39422 +QT_END_NAMESPACE
39423 + 39423 +
39424 +#endif // QSJISCODEC_H 39424 +#endif // QSJISCODEC_H
39425 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 39425 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
39426 index 517ac87..2eaff80 100644 39426 index 1ee586e..1376b67 100644
39427 --- a/src/corelib/codecs/qtextcodec.cpp 39427 --- a/src/corelib/codecs/qtextcodec.cpp
39428 +++ b/src/corelib/codecs/qtextcodec.cpp 39428 +++ b/src/corelib/codecs/qtextcodec.cpp
39429 @@ -67,16 +67,16 @@ 39429 @@ -67,16 +67,16 @@
39430 # include "qisciicodec_p.h" 39430 # include "qisciicodec_p.h"
39431 #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) 39431 #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY)
39472 -INSTALLS += target 39472 -INSTALLS += target
39473 - 39473 -
39474 -symbian:TARGET.UID3=0x2001E615 39474 -symbian:TARGET.UID3=0x2001E615
39475 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp 39475 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp
39476 deleted file mode 100644 39476 deleted file mode 100644
39477 index 9414e55..0000000 39477 index 12421a9..0000000
39478 --- a/src/plugins/codecs/cn/main.cpp 39478 --- a/src/plugins/codecs/cn/main.cpp
39479 +++ /dev/null 39479 +++ /dev/null
39480 @@ -1,145 +0,0 @@ 39480 @@ -1,145 +0,0 @@
39481 -/**************************************************************************** 39481 -/****************************************************************************
39482 -** 39482 -**
39483 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 39483 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
39484 -** Contact: http://www.qt-project.org/legal 39484 -** Contact: http://www.qt-project.org/legal
39485 -** 39485 -**
39486 -** This file is part of the plugins of the Qt Toolkit. 39486 -** This file is part of the plugins of the Qt Toolkit.
39487 -** 39487 -**
39488 -** $QT_BEGIN_LICENSE:LGPL$ 39488 -** $QT_BEGIN_LICENSE:LGPL$
39623 -QT_END_NAMESPACE 39623 -QT_END_NAMESPACE
39624 - 39624 -
39625 -#endif // QT_NO_TEXTCODECPLUGIN 39625 -#endif // QT_NO_TEXTCODECPLUGIN
39626 diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp 39626 diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp
39627 deleted file mode 100644 39627 deleted file mode 100644
39628 index 73d51fc..0000000 39628 index 06345ff..0000000
39629 --- a/src/plugins/codecs/cn/qgb18030codec.cpp 39629 --- a/src/plugins/codecs/cn/qgb18030codec.cpp
39630 +++ /dev/null 39630 +++ /dev/null
39631 @@ -1,9265 +0,0 @@ 39631 @@ -1,9265 +0,0 @@
39632 -/**************************************************************************** 39632 -/****************************************************************************
39633 -** 39633 -**
39634 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 39634 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
39635 -** Contact: http://www.qt-project.org/legal 39635 -** Contact: http://www.qt-project.org/legal
39636 -** 39636 -**
39637 -** This file is part of the plugins of the Qt Toolkit. 39637 -** This file is part of the plugins of the Qt Toolkit.
39638 -** 39638 -**
39639 -** $QT_BEGIN_LICENSE:LGPL$ 39639 -** $QT_BEGIN_LICENSE:LGPL$
48894 -QT_END_NAMESPACE 48894 -QT_END_NAMESPACE
48895 - 48895 -
48896 -#endif // QT_NO_TEXTCODEC 48896 -#endif // QT_NO_TEXTCODEC
48897 diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h 48897 diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h
48898 deleted file mode 100644 48898 deleted file mode 100644
48899 index 5d231d5..0000000 48899 index e3dd386..0000000
48900 --- a/src/plugins/codecs/cn/qgb18030codec.h 48900 --- a/src/plugins/codecs/cn/qgb18030codec.h
48901 +++ /dev/null 48901 +++ /dev/null
48902 @@ -1,159 +0,0 @@ 48902 @@ -1,159 +0,0 @@
48903 -/**************************************************************************** 48903 -/****************************************************************************
48904 -** 48904 -**
48905 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 48905 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
48906 -** Contact: http://www.qt-project.org/legal 48906 -** Contact: http://www.qt-project.org/legal
48907 -** 48907 -**
48908 -** This file is part of the plugins of the Qt Toolkit. 48908 -** This file is part of the plugins of the Qt Toolkit.
48909 -** 48909 -**
48910 -** $QT_BEGIN_LICENSE:LGPL$ 48910 -** $QT_BEGIN_LICENSE:LGPL$
49102 -INSTALLS += target 49102 -INSTALLS += target
49103 - 49103 -
49104 -symbian:TARGET.UID3=0x2001E614 49104 -symbian:TARGET.UID3=0x2001E614
49105 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp 49105 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp
49106 deleted file mode 100644 49106 deleted file mode 100644
49107 index 3e53fc8..0000000 49107 index 04b129a..0000000
49108 --- a/src/plugins/codecs/jp/main.cpp 49108 --- a/src/plugins/codecs/jp/main.cpp
49109 +++ /dev/null 49109 +++ /dev/null
49110 @@ -1,149 +0,0 @@ 49110 @@ -1,149 +0,0 @@
49111 -/**************************************************************************** 49111 -/****************************************************************************
49112 -** 49112 -**
49113 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49113 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49114 -** Contact: http://www.qt-project.org/legal 49114 -** Contact: http://www.qt-project.org/legal
49115 -** 49115 -**
49116 -** This file is part of the plugins of the Qt Toolkit. 49116 -** This file is part of the plugins of the Qt Toolkit.
49117 -** 49117 -**
49118 -** $QT_BEGIN_LICENSE:LGPL$ 49118 -** $QT_BEGIN_LICENSE:LGPL$
49257 -QT_END_NAMESPACE 49257 -QT_END_NAMESPACE
49258 - 49258 -
49259 -#endif // QT_NO_TEXTCODECPLUGIN 49259 -#endif // QT_NO_TEXTCODECPLUGIN
49260 diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp 49260 diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
49261 deleted file mode 100644 49261 deleted file mode 100644
49262 index 2c68919..0000000 49262 index 6e1be4a..0000000
49263 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp 49263 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp
49264 +++ /dev/null 49264 +++ /dev/null
49265 @@ -1,261 +0,0 @@ 49265 @@ -1,261 +0,0 @@
49266 -/**************************************************************************** 49266 -/****************************************************************************
49267 -** 49267 -**
49268 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49268 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49269 -** Contact: http://www.qt-project.org/legal 49269 -** Contact: http://www.qt-project.org/legal
49270 -** 49270 -**
49271 -** This file is part of the plugins of the Qt Toolkit. 49271 -** This file is part of the plugins of the Qt Toolkit.
49272 -** 49272 -**
49273 -** $QT_BEGIN_LICENSE:LGPL$ 49273 -** $QT_BEGIN_LICENSE:LGPL$
49524 -#endif // QT_NO_TEXTCODEC 49524 -#endif // QT_NO_TEXTCODEC
49525 - 49525 -
49526 -QT_END_NAMESPACE 49526 -QT_END_NAMESPACE
49527 diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h 49527 diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
49528 deleted file mode 100644 49528 deleted file mode 100644
49529 index 400cb03..0000000 49529 index bc3cbc7..0000000
49530 --- a/src/plugins/codecs/jp/qeucjpcodec.h 49530 --- a/src/plugins/codecs/jp/qeucjpcodec.h
49531 +++ /dev/null 49531 +++ /dev/null
49532 @@ -1,106 +0,0 @@ 49532 @@ -1,106 +0,0 @@
49533 -/**************************************************************************** 49533 -/****************************************************************************
49534 -** 49534 -**
49535 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49535 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49536 -** Contact: http://www.qt-project.org/legal 49536 -** Contact: http://www.qt-project.org/legal
49537 -** 49537 -**
49538 -** This file is part of the plugins of the Qt Toolkit. 49538 -** This file is part of the plugins of the Qt Toolkit.
49539 -** 49539 -**
49540 -** $QT_BEGIN_LICENSE:LGPL$ 49540 -** $QT_BEGIN_LICENSE:LGPL$
49636 -QT_END_NAMESPACE 49636 -QT_END_NAMESPACE
49637 - 49637 -
49638 -#endif // QEUCJPCODEC_H 49638 -#endif // QEUCJPCODEC_H
49639 diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp 49639 diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp
49640 deleted file mode 100644 49640 deleted file mode 100644
49641 index 11917ed..0000000 49641 index d5139aa..0000000
49642 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp 49642 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp
49643 +++ /dev/null 49643 +++ /dev/null
49644 @@ -1,145 +0,0 @@ 49644 @@ -1,145 +0,0 @@
49645 -/**************************************************************************** 49645 -/****************************************************************************
49646 -** 49646 -**
49647 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49647 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49648 -** Contact: http://www.qt-project.org/legal 49648 -** Contact: http://www.qt-project.org/legal
49649 -** 49649 -**
49650 -** This file is part of the plugins of the Qt Toolkit. 49650 -** This file is part of the plugins of the Qt Toolkit.
49651 -** 49651 -**
49652 -** $QT_BEGIN_LICENSE:LGPL$ 49652 -** $QT_BEGIN_LICENSE:LGPL$
49787 -#endif 49787 -#endif
49788 - 49788 -
49789 -QT_END_NAMESPACE 49789 -QT_END_NAMESPACE
49790 diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h 49790 diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h
49791 deleted file mode 100644 49791 deleted file mode 100644
49792 index bedac58..0000000 49792 index e905cd1..0000000
49793 --- a/src/plugins/codecs/jp/qfontjpcodec.h 49793 --- a/src/plugins/codecs/jp/qfontjpcodec.h
49794 +++ /dev/null 49794 +++ /dev/null
49795 @@ -1,93 +0,0 @@ 49795 @@ -1,93 +0,0 @@
49796 -/**************************************************************************** 49796 -/****************************************************************************
49797 -** 49797 -**
49798 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49798 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49799 -** Contact: http://www.qt-project.org/legal 49799 -** Contact: http://www.qt-project.org/legal
49800 -** 49800 -**
49801 -** This file is part of the plugins of the Qt Toolkit. 49801 -** This file is part of the plugins of the Qt Toolkit.
49802 -** 49802 -**
49803 -** $QT_BEGIN_LICENSE:LGPL$ 49803 -** $QT_BEGIN_LICENSE:LGPL$
49886 -QT_END_NAMESPACE 49886 -QT_END_NAMESPACE
49887 - 49887 -
49888 -#endif // QFONTJPCODEC_H 49888 -#endif // QFONTJPCODEC_H
49889 diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp 49889 diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp
49890 deleted file mode 100644 49890 deleted file mode 100644
49891 index 007dea1..0000000 49891 index 2c9be691..0000000
49892 --- a/src/plugins/codecs/jp/qjiscodec.cpp 49892 --- a/src/plugins/codecs/jp/qjiscodec.cpp
49893 +++ /dev/null 49893 +++ /dev/null
49894 @@ -1,367 +0,0 @@ 49894 @@ -1,367 +0,0 @@
49895 -/**************************************************************************** 49895 -/****************************************************************************
49896 -** 49896 -**
49897 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 49897 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
49898 -** Contact: http://www.qt-project.org/legal 49898 -** Contact: http://www.qt-project.org/legal
49899 -** 49899 -**
49900 -** This file is part of the plugins of the Qt Toolkit. 49900 -** This file is part of the plugins of the Qt Toolkit.
49901 -** 49901 -**
49902 -** $QT_BEGIN_LICENSE:LGPL$ 49902 -** $QT_BEGIN_LICENSE:LGPL$
50259 -#endif // QT_NO_TEXTCODEC 50259 -#endif // QT_NO_TEXTCODEC
50260 - 50260 -
50261 -QT_END_NAMESPACE 50261 -QT_END_NAMESPACE
50262 diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h 50262 diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
50263 deleted file mode 100644 50263 deleted file mode 100644
50264 index db2ce54..0000000 50264 index f6ba975..0000000
50265 --- a/src/plugins/codecs/jp/qjiscodec.h 50265 --- a/src/plugins/codecs/jp/qjiscodec.h
50266 +++ /dev/null 50266 +++ /dev/null
50267 @@ -1,106 +0,0 @@ 50267 @@ -1,106 +0,0 @@
50268 -/**************************************************************************** 50268 -/****************************************************************************
50269 -** 50269 -**
50270 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 50270 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
50271 -** Contact: http://www.qt-project.org/legal 50271 -** Contact: http://www.qt-project.org/legal
50272 -** 50272 -**
50273 -** This file is part of the plugins of the Qt Toolkit. 50273 -** This file is part of the plugins of the Qt Toolkit.
50274 -** 50274 -**
50275 -** $QT_BEGIN_LICENSE:LGPL$ 50275 -** $QT_BEGIN_LICENSE:LGPL$
50371 -QT_END_NAMESPACE 50371 -QT_END_NAMESPACE
50372 - 50372 -
50373 -#endif // QJISCODEC_H 50373 -#endif // QJISCODEC_H
50374 diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp 50374 diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp
50375 deleted file mode 100644 50375 deleted file mode 100644
50376 index fab366f..0000000 50376 index 66f2e34..0000000
50377 --- a/src/plugins/codecs/jp/qjpunicode.cpp 50377 --- a/src/plugins/codecs/jp/qjpunicode.cpp
50378 +++ /dev/null 50378 +++ /dev/null
50379 @@ -1,10700 +0,0 @@ 50379 @@ -1,10700 +0,0 @@
50380 -/**************************************************************************** 50380 -/****************************************************************************
50381 -** 50381 -**
50382 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 50382 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
50383 -** Contact: http://www.qt-project.org/legal 50383 -** Contact: http://www.qt-project.org/legal
50384 -** 50384 -**
50385 -** This file is part of the plugins of the Qt Toolkit. 50385 -** This file is part of the plugins of the Qt Toolkit.
50386 -** 50386 -**
50387 -** $QT_BEGIN_LICENSE:LGPL$ 50387 -** $QT_BEGIN_LICENSE:LGPL$
61077 -*/ 61077 -*/
61078 - 61078 -
61079 -QT_END_NAMESPACE 61079 -QT_END_NAMESPACE
61080 diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h 61080 diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
61081 deleted file mode 100644 61081 deleted file mode 100644
61082 index 1e7af75..0000000 61082 index 83bb8e1..0000000
61083 --- a/src/plugins/codecs/jp/qjpunicode.h 61083 --- a/src/plugins/codecs/jp/qjpunicode.h
61084 +++ /dev/null 61084 +++ /dev/null
61085 @@ -1,174 +0,0 @@ 61085 @@ -1,174 +0,0 @@
61086 -/**************************************************************************** 61086 -/****************************************************************************
61087 -** 61087 -**
61088 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 61088 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
61089 -** Contact: http://www.qt-project.org/legal 61089 -** Contact: http://www.qt-project.org/legal
61090 -** 61090 -**
61091 -** This file is part of the plugins of the Qt Toolkit. 61091 -** This file is part of the plugins of the Qt Toolkit.
61092 -** 61092 -**
61093 -** $QT_BEGIN_LICENSE:LGPL$ 61093 -** $QT_BEGIN_LICENSE:LGPL$
61257 -QT_END_NAMESPACE 61257 -QT_END_NAMESPACE
61258 - 61258 -
61259 -#endif // QJPUNICODE_H 61259 -#endif // QJPUNICODE_H
61260 diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp 61260 diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
61261 deleted file mode 100644 61261 deleted file mode 100644
61262 index aa4997f..0000000 61262 index 977f38f..0000000
61263 --- a/src/plugins/codecs/jp/qsjiscodec.cpp 61263 --- a/src/plugins/codecs/jp/qsjiscodec.cpp
61264 +++ /dev/null 61264 +++ /dev/null
61265 @@ -1,229 +0,0 @@ 61265 @@ -1,229 +0,0 @@
61266 -/**************************************************************************** 61266 -/****************************************************************************
61267 -** 61267 -**
61268 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 61268 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
61269 -** Contact: http://www.qt-project.org/legal 61269 -** Contact: http://www.qt-project.org/legal
61270 -** 61270 -**
61271 -** This file is part of the plugins of the Qt Toolkit. 61271 -** This file is part of the plugins of the Qt Toolkit.
61272 -** 61272 -**
61273 -** $QT_BEGIN_LICENSE:LGPL$ 61273 -** $QT_BEGIN_LICENSE:LGPL$
61492 -#endif // QT_NO_TEXTCODEC 61492 -#endif // QT_NO_TEXTCODEC
61493 - 61493 -
61494 -QT_END_NAMESPACE 61494 -QT_END_NAMESPACE
61495 diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h 61495 diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
61496 deleted file mode 100644 61496 deleted file mode 100644
61497 index 054fbe5..0000000 61497 index a4c0981..0000000
61498 --- a/src/plugins/codecs/jp/qsjiscodec.h 61498 --- a/src/plugins/codecs/jp/qsjiscodec.h
61499 +++ /dev/null 61499 +++ /dev/null
61500 @@ -1,106 +0,0 @@ 61500 @@ -1,106 +0,0 @@
61501 -/**************************************************************************** 61501 -/****************************************************************************
61502 -** 61502 -**
61503 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 61503 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
61504 -** Contact: http://www.qt-project.org/legal 61504 -** Contact: http://www.qt-project.org/legal
61505 -** 61505 -**
61506 -** This file is part of the plugins of the Qt Toolkit. 61506 -** This file is part of the plugins of the Qt Toolkit.
61507 -** 61507 -**
61508 -** $QT_BEGIN_LICENSE:LGPL$ 61508 -** $QT_BEGIN_LICENSE:LGPL$
61604 -QT_END_NAMESPACE 61604 -QT_END_NAMESPACE
61605 - 61605 -
61606 -#endif // QSJISCODEC_H 61606 -#endif // QSJISCODEC_H
61607 diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h 61607 diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h
61608 deleted file mode 100644 61608 deleted file mode 100644
61609 index a291677..0000000 61609 index 7e1af4e..0000000
61610 --- a/src/plugins/codecs/kr/cp949codetbl.h 61610 --- a/src/plugins/codecs/kr/cp949codetbl.h
61611 +++ /dev/null 61611 +++ /dev/null
61612 @@ -1,637 +0,0 @@ 61612 @@ -1,637 +0,0 @@
61613 -/**************************************************************************** 61613 -/****************************************************************************
61614 -** 61614 -**
61615 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 61615 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
61616 -** Contact: http://www.qt-project.org/legal 61616 -** Contact: http://www.qt-project.org/legal
61617 -** 61617 -**
61618 -** This file is part of the plugins of the Qt Toolkit. 61618 -** This file is part of the plugins of the Qt Toolkit.
61619 -** 61619 -**
61620 -** $QT_BEGIN_LICENSE:LGPL$ 61620 -** $QT_BEGIN_LICENSE:LGPL$
62273 -INSTALLS += target 62273 -INSTALLS += target
62274 - 62274 -
62275 -symbian:TARGET.UID3=0x2001B2E5 62275 -symbian:TARGET.UID3=0x2001B2E5
62276 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp 62276 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp
62277 deleted file mode 100644 62277 deleted file mode 100644
62278 index 87ccd6c..0000000 62278 index 918b8bd..0000000
62279 --- a/src/plugins/codecs/kr/main.cpp 62279 --- a/src/plugins/codecs/kr/main.cpp
62280 +++ /dev/null 62280 +++ /dev/null
62281 @@ -1,131 +0,0 @@ 62281 @@ -1,131 +0,0 @@
62282 -/**************************************************************************** 62282 -/****************************************************************************
62283 -** 62283 -**
62284 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 62284 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
62285 -** Contact: http://www.qt-project.org/legal 62285 -** Contact: http://www.qt-project.org/legal
62286 -** 62286 -**
62287 -** This file is part of the plugins of the Qt Toolkit. 62287 -** This file is part of the plugins of the Qt Toolkit.
62288 -** 62288 -**
62289 -** $QT_BEGIN_LICENSE:LGPL$ 62289 -** $QT_BEGIN_LICENSE:LGPL$
62410 -#endif // QT_NO_TEXTCODECPLUGIN 62410 -#endif // QT_NO_TEXTCODECPLUGIN
62411 - 62411 -
62412 -QT_END_NAMESPACE 62412 -QT_END_NAMESPACE
62413 diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp 62413 diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
62414 deleted file mode 100644 62414 deleted file mode 100644
62415 index 307b0f3..0000000 62415 index cb51181..0000000
62416 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp 62416 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp
62417 +++ /dev/null 62417 +++ /dev/null
62418 @@ -1,3571 +0,0 @@ 62418 @@ -1,3571 +0,0 @@
62419 -/**************************************************************************** 62419 -/****************************************************************************
62420 -** 62420 -**
62421 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 62421 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
62422 -** Contact: http://www.qt-project.org/legal 62422 -** Contact: http://www.qt-project.org/legal
62423 -** 62423 -**
62424 -** This file is part of the plugins of the Qt Toolkit. 62424 -** This file is part of the plugins of the Qt Toolkit.
62425 -** 62425 -**
62426 -** $QT_BEGIN_LICENSE:LGPL$ 62426 -** $QT_BEGIN_LICENSE:LGPL$
65987 -#endif // QT_NO_TEXTCODEC 65987 -#endif // QT_NO_TEXTCODEC
65988 - 65988 -
65989 -QT_END_NAMESPACE 65989 -QT_END_NAMESPACE
65990 diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h 65990 diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h
65991 deleted file mode 100644 65991 deleted file mode 100644
65992 index 31c3b1b..0000000 65992 index c7a9b15..0000000
65993 --- a/src/plugins/codecs/kr/qeuckrcodec.h 65993 --- a/src/plugins/codecs/kr/qeuckrcodec.h
65994 +++ /dev/null 65994 +++ /dev/null
65995 @@ -1,129 +0,0 @@ 65995 @@ -1,129 +0,0 @@
65996 -/**************************************************************************** 65996 -/****************************************************************************
65997 -** 65997 -**
65998 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 65998 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
65999 -** Contact: http://www.qt-project.org/legal 65999 -** Contact: http://www.qt-project.org/legal
66000 -** 66000 -**
66001 -** This file is part of the plugins of the Qt Toolkit. 66001 -** This file is part of the plugins of the Qt Toolkit.
66002 -** 66002 -**
66003 -** $QT_BEGIN_LICENSE:LGPL$ 66003 -** $QT_BEGIN_LICENSE:LGPL$
66122 -QT_END_NAMESPACE 66122 -QT_END_NAMESPACE
66123 - 66123 -
66124 -#endif // QEUCKRCODEC_H 66124 -#endif // QEUCKRCODEC_H
66125 diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp 66125 diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp
66126 deleted file mode 100644 66126 deleted file mode 100644
66127 index e12ad21..0000000 66127 index 30e6d8c..0000000
66128 --- a/src/plugins/codecs/tw/main.cpp 66128 --- a/src/plugins/codecs/tw/main.cpp
66129 +++ /dev/null 66129 +++ /dev/null
66130 @@ -1,138 +0,0 @@ 66130 @@ -1,138 +0,0 @@
66131 -/**************************************************************************** 66131 -/****************************************************************************
66132 -** 66132 -**
66133 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 66133 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
66134 -** Contact: http://www.qt-project.org/legal 66134 -** Contact: http://www.qt-project.org/legal
66135 -** 66135 -**
66136 -** This file is part of the plugins of the Qt Toolkit. 66136 -** This file is part of the plugins of the Qt Toolkit.
66137 -** 66137 -**
66138 -** $QT_BEGIN_LICENSE:LGPL$ 66138 -** $QT_BEGIN_LICENSE:LGPL$
66266 -#endif // QT_NO_TEXTCODECPLUGIN 66266 -#endif // QT_NO_TEXTCODECPLUGIN
66267 - 66267 -
66268 -QT_END_NAMESPACE 66268 -QT_END_NAMESPACE
66269 diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp 66269 diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp
66270 deleted file mode 100644 66270 deleted file mode 100644
66271 index 0c673f8..0000000 66271 index 2d37f56..0000000
66272 --- a/src/plugins/codecs/tw/qbig5codec.cpp 66272 --- a/src/plugins/codecs/tw/qbig5codec.cpp
66273 +++ /dev/null 66273 +++ /dev/null
66274 @@ -1,12788 +0,0 @@ 66274 @@ -1,12788 +0,0 @@
66275 -/**************************************************************************** 66275 -/****************************************************************************
66276 -** 66276 -**
66277 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 66277 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
66278 -** Contact: http://www.qt-project.org/legal 66278 -** Contact: http://www.qt-project.org/legal
66279 -** 66279 -**
66280 -** This file is part of the plugins of the Qt Toolkit. 66280 -** This file is part of the plugins of the Qt Toolkit.
66281 -** 66281 -**
66282 -** $QT_BEGIN_LICENSE:LGPL$ 66282 -** $QT_BEGIN_LICENSE:LGPL$
79060 -#endif // QT_NO_TEXTCODEC 79060 -#endif // QT_NO_TEXTCODEC
79061 - 79061 -
79062 -QT_END_NAMESPACE 79062 -QT_END_NAMESPACE
79063 diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h 79063 diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
79064 deleted file mode 100644 79064 deleted file mode 100644
79065 index 19f470c..0000000 79065 index 334764c..0000000
79066 --- a/src/plugins/codecs/tw/qbig5codec.h 79066 --- a/src/plugins/codecs/tw/qbig5codec.h
79067 +++ /dev/null 79067 +++ /dev/null
79068 @@ -1,124 +0,0 @@ 79068 @@ -1,124 +0,0 @@
79069 -/**************************************************************************** 79069 -/****************************************************************************
79070 -** 79070 -**
79071 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79071 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79072 -** Contact: http://www.qt-project.org/legal 79072 -** Contact: http://www.qt-project.org/legal
79073 -** 79073 -**
79074 -** This file is part of the plugins of the Qt Toolkit. 79074 -** This file is part of the plugins of the Qt Toolkit.
79075 -** 79075 -**
79076 -** $QT_BEGIN_LICENSE:LGPL$ 79076 -** $QT_BEGIN_LICENSE:LGPL$
79227 -} 79227 -}
79228 !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines 79228 !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
79229 !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems 79229 !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems
79230 embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers 79230 embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
79231 -- 79231 --
79232 1.8.1.4 79232 1.8.5.2 (Apple Git-48)
79233 79233
79234 79234
79235 From aa4d579e9393c0f9b1be42c3b37c9feb04ad42d6 Mon Sep 17 00:00:00 2001 79235 From 4a97b4b52b58070afb2de01fc59a524977475a43 Mon Sep 17 00:00:00 2001
79236 From: Mark Brand <mabrand@mabrand.nl> 79236 From: Mark Brand <mabrand@mabrand.nl>
79237 Date: Wed, 18 Jan 2012 21:01:26 +0100 79237 Date: Wed, 18 Jan 2012 21:01:26 +0100
79238 Subject: [PATCH 06/17] update private header references 79238 Subject: [PATCH 06/17] update private header references
79239 79239
79240 backported from qt5/qtbase 79240 backported from qt5/qtbase
79242 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 79242 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
79243 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 79243 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
79244 (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa) 79244 (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa)
79245 79245
79246 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 79246 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
79247 index 0c673f8..ea3fe52 100644 79247 index 2d37f56..1b46859 100644
79248 --- a/src/corelib/codecs/qbig5codec.cpp 79248 --- a/src/corelib/codecs/qbig5codec.cpp
79249 +++ b/src/corelib/codecs/qbig5codec.cpp 79249 +++ b/src/corelib/codecs/qbig5codec.cpp
79250 @@ -39,7 +39,7 @@ 79250 @@ -39,7 +39,7 @@
79251 ** 79251 **
79252 ****************************************************************************/ 79252 ****************************************************************************/
79255 +#include "qbig5codec_p.h" 79255 +#include "qbig5codec_p.h"
79256 79256
79257 QT_BEGIN_NAMESPACE 79257 QT_BEGIN_NAMESPACE
79258 79258
79259 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 79259 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
79260 index 2c68919..64b5e8f 100644 79260 index 6e1be4a..6f09059 100644
79261 --- a/src/corelib/codecs/qeucjpcodec.cpp 79261 --- a/src/corelib/codecs/qeucjpcodec.cpp
79262 +++ b/src/corelib/codecs/qeucjpcodec.cpp 79262 +++ b/src/corelib/codecs/qeucjpcodec.cpp
79263 @@ -73,7 +73,7 @@ 79263 @@ -73,7 +73,7 @@
79264 * SUCH DAMAGE. 79264 * SUCH DAMAGE.
79265 */ 79265 */
79268 +#include "qeucjpcodec_p.h" 79268 +#include "qeucjpcodec_p.h"
79269 79269
79270 QT_BEGIN_NAMESPACE 79270 QT_BEGIN_NAMESPACE
79271 79271
79272 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 79272 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
79273 index 400cb03..aa672fa 100644 79273 index bc3cbc7..c717050 100644
79274 --- a/src/corelib/codecs/qeucjpcodec_p.h 79274 --- a/src/corelib/codecs/qeucjpcodec_p.h
79275 +++ b/src/corelib/codecs/qeucjpcodec_p.h 79275 +++ b/src/corelib/codecs/qeucjpcodec_p.h
79276 @@ -71,7 +71,7 @@ 79276 @@ -71,7 +71,7 @@
79277 #ifndef QEUCJPCODEC_H 79277 #ifndef QEUCJPCODEC_H
79278 #define QEUCJPCODEC_H 79278 #define QEUCJPCODEC_H
79281 +#include "qjpunicode_p.h" 79281 +#include "qjpunicode_p.h"
79282 #include <QtCore/qtextcodec.h> 79282 #include <QtCore/qtextcodec.h>
79283 #include <QtCore/qlist.h> 79283 #include <QtCore/qlist.h>
79284 79284
79285 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 79285 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
79286 index 307b0f3..5e2daac 100644 79286 index cb51181..a66d4e2 100644
79287 --- a/src/corelib/codecs/qeuckrcodec.cpp 79287 --- a/src/corelib/codecs/qeuckrcodec.cpp
79288 +++ b/src/corelib/codecs/qeuckrcodec.cpp 79288 +++ b/src/corelib/codecs/qeuckrcodec.cpp
79289 @@ -65,8 +65,8 @@ 79289 @@ -65,8 +65,8 @@
79290 QString toUnicode(const char* chars, int len) const; 79290 QString toUnicode(const char* chars, int len) const;
79291 */ 79291 */
79296 +#include "cp949codetbl_p.h" 79296 +#include "cp949codetbl_p.h"
79297 79297
79298 QT_BEGIN_NAMESPACE 79298 QT_BEGIN_NAMESPACE
79299 79299
79300 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 79300 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
79301 index 11917ed..3e62b7b 100644 79301 index d5139aa..fdd594a 100644
79302 --- a/src/corelib/codecs/qfontjpcodec.cpp 79302 --- a/src/corelib/codecs/qfontjpcodec.cpp
79303 +++ b/src/corelib/codecs/qfontjpcodec.cpp 79303 +++ b/src/corelib/codecs/qfontjpcodec.cpp
79304 @@ -39,9 +39,9 @@ 79304 @@ -39,9 +39,9 @@
79305 ** 79305 **
79306 ****************************************************************************/ 79306 ****************************************************************************/
79312 +#include "qjpunicode_p.h" 79312 +#include "qjpunicode_p.h"
79313 79313
79314 QT_BEGIN_NAMESPACE 79314 QT_BEGIN_NAMESPACE
79315 79315
79316 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 79316 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
79317 index 73d51fc..091f9ce 100644 79317 index 06345ff..01682d8 100644
79318 --- a/src/corelib/codecs/qgb18030codec.cpp 79318 --- a/src/corelib/codecs/qgb18030codec.cpp
79319 +++ b/src/corelib/codecs/qgb18030codec.cpp 79319 +++ b/src/corelib/codecs/qgb18030codec.cpp
79320 @@ -44,7 +44,7 @@ 79320 @@ -44,7 +44,7 @@
79321 \internal 79321 \internal
79322 */ 79322 */
79325 +#include "qgb18030codec_p.h" 79325 +#include "qgb18030codec_p.h"
79326 79326
79327 #ifndef QT_NO_TEXTCODEC 79327 #ifndef QT_NO_TEXTCODEC
79328 79328
79329 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 79329 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
79330 index 007dea1..e11431f 100644 79330 index 2c9be691..af9a32c 100644
79331 --- a/src/corelib/codecs/qjiscodec.cpp 79331 --- a/src/corelib/codecs/qjiscodec.cpp
79332 +++ b/src/corelib/codecs/qjiscodec.cpp 79332 +++ b/src/corelib/codecs/qjiscodec.cpp
79333 @@ -48,7 +48,7 @@ 79333 @@ -48,7 +48,7 @@
79334 \internal 79334 \internal
79335 */ 79335 */
79338 +#include "qjiscodec_p.h" 79338 +#include "qjiscodec_p.h"
79339 #include "qlist.h" 79339 #include "qlist.h"
79340 79340
79341 QT_BEGIN_NAMESPACE 79341 QT_BEGIN_NAMESPACE
79342 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 79342 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
79343 index db2ce54..7e0a2d7 100644 79343 index f6ba975..0d14b48 100644
79344 --- a/src/corelib/codecs/qjiscodec_p.h 79344 --- a/src/corelib/codecs/qjiscodec_p.h
79345 +++ b/src/corelib/codecs/qjiscodec_p.h 79345 +++ b/src/corelib/codecs/qjiscodec_p.h
79346 @@ -71,7 +71,7 @@ 79346 @@ -71,7 +71,7 @@
79347 #ifndef QJISCODEC_H 79347 #ifndef QJISCODEC_H
79348 #define QJISCODEC_H 79348 #define QJISCODEC_H
79351 +#include "qjpunicode_p.h" 79351 +#include "qjpunicode_p.h"
79352 #include <QtCore/qtextcodec.h> 79352 #include <QtCore/qtextcodec.h>
79353 #include <QtCore/qlist.h> 79353 #include <QtCore/qlist.h>
79354 79354
79355 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 79355 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
79356 index fab366f..240af89 100644 79356 index 66f2e34..304d26e 100644
79357 --- a/src/corelib/codecs/qjpunicode.cpp 79357 --- a/src/corelib/codecs/qjpunicode.cpp
79358 +++ b/src/corelib/codecs/qjpunicode.cpp 79358 +++ b/src/corelib/codecs/qjpunicode.cpp
79359 @@ -44,7 +44,7 @@ 79359 @@ -44,7 +44,7 @@
79360 \internal 79360 \internal
79361 */ 79361 */
79364 +#include "qjpunicode_p.h" 79364 +#include "qjpunicode_p.h"
79365 79365
79366 #include "qbytearray.h" 79366 #include "qbytearray.h"
79367 #include <stdlib.h> 79367 #include <stdlib.h>
79368 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 79368 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
79369 index aa4997f..8519147 100644 79369 index 977f38f..5c69748 100644
79370 --- a/src/corelib/codecs/qsjiscodec.cpp 79370 --- a/src/corelib/codecs/qsjiscodec.cpp
79371 +++ b/src/corelib/codecs/qsjiscodec.cpp 79371 +++ b/src/corelib/codecs/qsjiscodec.cpp
79372 @@ -48,7 +48,7 @@ 79372 @@ -48,7 +48,7 @@
79373 \internal 79373 \internal
79374 */ 79374 */
79377 +#include "qsjiscodec_p.h" 79377 +#include "qsjiscodec_p.h"
79378 #include "qlist.h" 79378 #include "qlist.h"
79379 79379
79380 QT_BEGIN_NAMESPACE 79380 QT_BEGIN_NAMESPACE
79381 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 79381 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
79382 index 054fbe5..c1e4689 100644 79382 index a4c0981..5025968 100644
79383 --- a/src/corelib/codecs/qsjiscodec_p.h 79383 --- a/src/corelib/codecs/qsjiscodec_p.h
79384 +++ b/src/corelib/codecs/qsjiscodec_p.h 79384 +++ b/src/corelib/codecs/qsjiscodec_p.h
79385 @@ -71,7 +71,7 @@ 79385 @@ -71,7 +71,7 @@
79386 #ifndef QSJISCODEC_H 79386 #ifndef QSJISCODEC_H
79387 #define QSJISCODEC_H 79387 #define QSJISCODEC_H
79390 +#include "qjpunicode_p.h" 79390 +#include "qjpunicode_p.h"
79391 #include <QtCore/qtextcodec.h> 79391 #include <QtCore/qtextcodec.h>
79392 #include <QtCore/qlist.h> 79392 #include <QtCore/qlist.h>
79393 79393
79394 -- 79394 --
79395 1.8.1.4 79395 1.8.5.2 (Apple Git-48)
79396 79396
79397 79397
79398 From 1461f769066a4e73a421f88c57f6ebd5de279f9d Mon Sep 17 00:00:00 2001 79398 From 335262793a24a8444ad181c7e744cb29cff06e58 Mon Sep 17 00:00:00 2001
79399 From: Mark Brand <mabrand@mabrand.nl> 79399 From: Mark Brand <mabrand@mabrand.nl>
79400 Date: Sun, 3 Jul 2011 21:53:27 +0200 79400 Date: Sun, 3 Jul 2011 21:53:27 +0200
79401 Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs 79401 Subject: [PATCH 07/17] cosmetic adjustments for files moved to core/codecs
79402 79402
79403 -update old reference to 'plugin' 79403 -update old reference to 'plugin'
79409 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 79409 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
79410 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 79410 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
79411 (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967) 79411 (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967)
79412 79412
79413 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h 79413 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
79414 index a291677..336b0b7 100644 79414 index 7e1af4e..952090a 100644
79415 --- a/src/corelib/codecs/cp949codetbl_p.h 79415 --- a/src/corelib/codecs/cp949codetbl_p.h
79416 +++ b/src/corelib/codecs/cp949codetbl_p.h 79416 +++ b/src/corelib/codecs/cp949codetbl_p.h
79417 @@ -3,7 +3,7 @@ 79417 @@ -3,7 +3,7 @@
79418 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79418 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79419 ** Contact: http://www.qt-project.org/legal 79419 ** Contact: http://www.qt-project.org/legal
79420 ** 79420 **
79421 -** This file is part of the plugins of the Qt Toolkit. 79421 -** This file is part of the plugins of the Qt Toolkit.
79422 +** This file is part of the QtCore module of the Qt Toolkit. 79422 +** This file is part of the QtCore module of the Qt Toolkit.
79423 ** 79423 **
79450 }; 79450 };
79451 79451
79452 -#endif // CP494CODETBL_H 79452 -#endif // CP494CODETBL_H
79453 +#endif // CP494CODETBL_P_H 79453 +#endif // CP494CODETBL_P_H
79454 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 79454 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
79455 index ea3fe52..e55af06 100644 79455 index 1b46859..d48ccaf 100644
79456 --- a/src/corelib/codecs/qbig5codec.cpp 79456 --- a/src/corelib/codecs/qbig5codec.cpp
79457 +++ b/src/corelib/codecs/qbig5codec.cpp 79457 +++ b/src/corelib/codecs/qbig5codec.cpp
79458 @@ -3,7 +3,7 @@ 79458 @@ -3,7 +3,7 @@
79459 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79459 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79460 ** Contact: http://www.qt-project.org/legal 79460 ** Contact: http://www.qt-project.org/legal
79461 ** 79461 **
79462 -** This file is part of the plugins of the Qt Toolkit. 79462 -** This file is part of the plugins of the Qt Toolkit.
79463 +** This file is part of the QtCore module of the Qt Toolkit. 79463 +** This file is part of the QtCore module of the Qt Toolkit.
79464 ** 79464 **
79465 ** $QT_BEGIN_LICENSE:LGPL$ 79465 ** $QT_BEGIN_LICENSE:LGPL$
79466 ** Commercial License Usage 79466 ** Commercial License Usage
79467 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h 79467 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
79468 index 19f470c..9e1d678 100644 79468 index 334764c..ba3b345 100644
79469 --- a/src/corelib/codecs/qbig5codec_p.h 79469 --- a/src/corelib/codecs/qbig5codec_p.h
79470 +++ b/src/corelib/codecs/qbig5codec_p.h 79470 +++ b/src/corelib/codecs/qbig5codec_p.h
79471 @@ -3,7 +3,7 @@ 79471 @@ -3,7 +3,7 @@
79472 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79472 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79473 ** Contact: http://www.qt-project.org/legal 79473 ** Contact: http://www.qt-project.org/legal
79474 ** 79474 **
79475 -** This file is part of the plugins of the Qt Toolkit. 79475 -** This file is part of the plugins of the Qt Toolkit.
79476 +** This file is part of the QtCore module of the Qt Toolkit. 79476 +** This file is part of the QtCore module of the Qt Toolkit.
79477 ** 79477 **
79504 QT_END_NAMESPACE 79504 QT_END_NAMESPACE
79505 79505
79506 -#endif // QBIG5CODEC_H 79506 -#endif // QBIG5CODEC_H
79507 +#endif // QBIG5CODEC_P_H 79507 +#endif // QBIG5CODEC_P_H
79508 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 79508 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
79509 index 64b5e8f..4466496 100644 79509 index 6f09059..f4cb649 100644
79510 --- a/src/corelib/codecs/qeucjpcodec.cpp 79510 --- a/src/corelib/codecs/qeucjpcodec.cpp
79511 +++ b/src/corelib/codecs/qeucjpcodec.cpp 79511 +++ b/src/corelib/codecs/qeucjpcodec.cpp
79512 @@ -3,7 +3,7 @@ 79512 @@ -3,7 +3,7 @@
79513 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79513 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79514 ** Contact: http://www.qt-project.org/legal 79514 ** Contact: http://www.qt-project.org/legal
79515 ** 79515 **
79516 -** This file is part of the plugins of the Qt Toolkit. 79516 -** This file is part of the plugins of the Qt Toolkit.
79517 +** This file is part of the QtCore module of the Qt Toolkit. 79517 +** This file is part of the QtCore module of the Qt Toolkit.
79518 ** 79518 **
79519 ** $QT_BEGIN_LICENSE:LGPL$ 79519 ** $QT_BEGIN_LICENSE:LGPL$
79520 ** Commercial License Usage 79520 ** Commercial License Usage
79521 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 79521 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
79522 index aa672fa..2102b71 100644 79522 index c717050..b6d6c6b 100644
79523 --- a/src/corelib/codecs/qeucjpcodec_p.h 79523 --- a/src/corelib/codecs/qeucjpcodec_p.h
79524 +++ b/src/corelib/codecs/qeucjpcodec_p.h 79524 +++ b/src/corelib/codecs/qeucjpcodec_p.h
79525 @@ -3,7 +3,7 @@ 79525 @@ -3,7 +3,7 @@
79526 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79526 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79527 ** Contact: http://www.qt-project.org/legal 79527 ** Contact: http://www.qt-project.org/legal
79528 ** 79528 **
79529 -** This file is part of the plugins of the Qt Toolkit. 79529 -** This file is part of the plugins of the Qt Toolkit.
79530 +** This file is part of the QtCore module of the Qt Toolkit. 79530 +** This file is part of the QtCore module of the Qt Toolkit.
79531 ** 79531 **
79558 QT_END_NAMESPACE 79558 QT_END_NAMESPACE
79559 79559
79560 -#endif // QEUCJPCODEC_H 79560 -#endif // QEUCJPCODEC_H
79561 +#endif // QEUCJPCODEC_P_H 79561 +#endif // QEUCJPCODEC_P_H
79562 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 79562 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
79563 index 5e2daac..7a01ef7 100644 79563 index a66d4e2..33e6786 100644
79564 --- a/src/corelib/codecs/qeuckrcodec.cpp 79564 --- a/src/corelib/codecs/qeuckrcodec.cpp
79565 +++ b/src/corelib/codecs/qeuckrcodec.cpp 79565 +++ b/src/corelib/codecs/qeuckrcodec.cpp
79566 @@ -3,7 +3,7 @@ 79566 @@ -3,7 +3,7 @@
79567 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79567 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79568 ** Contact: http://www.qt-project.org/legal 79568 ** Contact: http://www.qt-project.org/legal
79569 ** 79569 **
79570 -** This file is part of the plugins of the Qt Toolkit. 79570 -** This file is part of the plugins of the Qt Toolkit.
79571 +** This file is part of the QtCore module of the Qt Toolkit. 79571 +** This file is part of the QtCore module of the Qt Toolkit.
79572 ** 79572 **
79573 ** $QT_BEGIN_LICENSE:LGPL$ 79573 ** $QT_BEGIN_LICENSE:LGPL$
79574 ** Commercial License Usage 79574 ** Commercial License Usage
79575 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h 79575 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
79576 index 31c3b1b..e74b9c9 100644 79576 index c7a9b15..ebe334d 100644
79577 --- a/src/corelib/codecs/qeuckrcodec_p.h 79577 --- a/src/corelib/codecs/qeuckrcodec_p.h
79578 +++ b/src/corelib/codecs/qeuckrcodec_p.h 79578 +++ b/src/corelib/codecs/qeuckrcodec_p.h
79579 @@ -3,7 +3,7 @@ 79579 @@ -3,7 +3,7 @@
79580 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79580 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79581 ** Contact: http://www.qt-project.org/legal 79581 ** Contact: http://www.qt-project.org/legal
79582 ** 79582 **
79583 -** This file is part of the plugins of the Qt Toolkit. 79583 -** This file is part of the plugins of the Qt Toolkit.
79584 +** This file is part of the QtCore module of the Qt Toolkit. 79584 +** This file is part of the QtCore module of the Qt Toolkit.
79585 ** 79585 **
79612 QT_END_NAMESPACE 79612 QT_END_NAMESPACE
79613 79613
79614 -#endif // QEUCKRCODEC_H 79614 -#endif // QEUCKRCODEC_H
79615 +#endif // QEUCKRCODEC_P_H 79615 +#endif // QEUCKRCODEC_P_H
79616 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 79616 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
79617 index 3e62b7b..4b267bb 100644 79617 index fdd594a..c79d9d5 100644
79618 --- a/src/corelib/codecs/qfontjpcodec.cpp 79618 --- a/src/corelib/codecs/qfontjpcodec.cpp
79619 +++ b/src/corelib/codecs/qfontjpcodec.cpp 79619 +++ b/src/corelib/codecs/qfontjpcodec.cpp
79620 @@ -3,7 +3,7 @@ 79620 @@ -3,7 +3,7 @@
79621 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79621 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79622 ** Contact: http://www.qt-project.org/legal 79622 ** Contact: http://www.qt-project.org/legal
79623 ** 79623 **
79624 -** This file is part of the plugins of the Qt Toolkit. 79624 -** This file is part of the plugins of the Qt Toolkit.
79625 +** This file is part of the QtCore module of the Qt Toolkit. 79625 +** This file is part of the QtCore module of the Qt Toolkit.
79626 ** 79626 **
79627 ** $QT_BEGIN_LICENSE:LGPL$ 79627 ** $QT_BEGIN_LICENSE:LGPL$
79628 ** Commercial License Usage 79628 ** Commercial License Usage
79629 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h 79629 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
79630 index bedac58..f8aa810 100644 79630 index e905cd1..0eea2cd 100644
79631 --- a/src/corelib/codecs/qfontjpcodec_p.h 79631 --- a/src/corelib/codecs/qfontjpcodec_p.h
79632 +++ b/src/corelib/codecs/qfontjpcodec_p.h 79632 +++ b/src/corelib/codecs/qfontjpcodec_p.h
79633 @@ -3,7 +3,7 @@ 79633 @@ -3,7 +3,7 @@
79634 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79634 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79635 ** Contact: http://www.qt-project.org/legal 79635 ** Contact: http://www.qt-project.org/legal
79636 ** 79636 **
79637 -** This file is part of the plugins of the Qt Toolkit. 79637 -** This file is part of the plugins of the Qt Toolkit.
79638 +** This file is part of the QtCore module of the Qt Toolkit. 79638 +** This file is part of the QtCore module of the Qt Toolkit.
79639 ** 79639 **
79666 QT_END_NAMESPACE 79666 QT_END_NAMESPACE
79667 79667
79668 -#endif // QFONTJPCODEC_H 79668 -#endif // QFONTJPCODEC_H
79669 +#endif // QFONTJPCODEC_P_H 79669 +#endif // QFONTJPCODEC_P_H
79670 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 79670 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
79671 index 091f9ce..cf60424 100644 79671 index 01682d8..37bc141 100644
79672 --- a/src/corelib/codecs/qgb18030codec.cpp 79672 --- a/src/corelib/codecs/qgb18030codec.cpp
79673 +++ b/src/corelib/codecs/qgb18030codec.cpp 79673 +++ b/src/corelib/codecs/qgb18030codec.cpp
79674 @@ -3,7 +3,7 @@ 79674 @@ -3,7 +3,7 @@
79675 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79675 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79676 ** Contact: http://www.qt-project.org/legal 79676 ** Contact: http://www.qt-project.org/legal
79677 ** 79677 **
79678 -** This file is part of the plugins of the Qt Toolkit. 79678 -** This file is part of the plugins of the Qt Toolkit.
79679 +** This file is part of the QtCore module of the Qt Toolkit. 79679 +** This file is part of the QtCore module of the Qt Toolkit.
79680 ** 79680 **
79681 ** $QT_BEGIN_LICENSE:LGPL$ 79681 ** $QT_BEGIN_LICENSE:LGPL$
79682 ** Commercial License Usage 79682 ** Commercial License Usage
79683 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h 79683 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
79684 index 5d231d5..fe53d49 100644 79684 index e3dd386..826edf7 100644
79685 --- a/src/corelib/codecs/qgb18030codec_p.h 79685 --- a/src/corelib/codecs/qgb18030codec_p.h
79686 +++ b/src/corelib/codecs/qgb18030codec_p.h 79686 +++ b/src/corelib/codecs/qgb18030codec_p.h
79687 @@ -3,7 +3,7 @@ 79687 @@ -3,7 +3,7 @@
79688 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79688 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79689 ** Contact: http://www.qt-project.org/legal 79689 ** Contact: http://www.qt-project.org/legal
79690 ** 79690 **
79691 -** This file is part of the plugins of the Qt Toolkit. 79691 -** This file is part of the plugins of the Qt Toolkit.
79692 +** This file is part of the QtCore module of the Qt Toolkit. 79692 +** This file is part of the QtCore module of the Qt Toolkit.
79693 ** 79693 **
79720 QT_END_NAMESPACE 79720 QT_END_NAMESPACE
79721 79721
79722 -#endif // QGB18030CODEC_H 79722 -#endif // QGB18030CODEC_H
79723 +#endif // QGB18030CODEC_P_H 79723 +#endif // QGB18030CODEC_P_H
79724 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 79724 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
79725 index e11431f..6135776 100644 79725 index af9a32c..dd7e1ee 100644
79726 --- a/src/corelib/codecs/qjiscodec.cpp 79726 --- a/src/corelib/codecs/qjiscodec.cpp
79727 +++ b/src/corelib/codecs/qjiscodec.cpp 79727 +++ b/src/corelib/codecs/qjiscodec.cpp
79728 @@ -3,7 +3,7 @@ 79728 @@ -3,7 +3,7 @@
79729 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79729 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79730 ** Contact: http://www.qt-project.org/legal 79730 ** Contact: http://www.qt-project.org/legal
79731 ** 79731 **
79732 -** This file is part of the plugins of the Qt Toolkit. 79732 -** This file is part of the plugins of the Qt Toolkit.
79733 +** This file is part of the QtCore module of the Qt Toolkit. 79733 +** This file is part of the QtCore module of the Qt Toolkit.
79734 ** 79734 **
79735 ** $QT_BEGIN_LICENSE:LGPL$ 79735 ** $QT_BEGIN_LICENSE:LGPL$
79736 ** Commercial License Usage 79736 ** Commercial License Usage
79737 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 79737 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
79738 index 7e0a2d7..e2b6cf2 100644 79738 index 0d14b48..e75dbd6 100644
79739 --- a/src/corelib/codecs/qjiscodec_p.h 79739 --- a/src/corelib/codecs/qjiscodec_p.h
79740 +++ b/src/corelib/codecs/qjiscodec_p.h 79740 +++ b/src/corelib/codecs/qjiscodec_p.h
79741 @@ -3,7 +3,7 @@ 79741 @@ -3,7 +3,7 @@
79742 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79742 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79743 ** Contact: http://www.qt-project.org/legal 79743 ** Contact: http://www.qt-project.org/legal
79744 ** 79744 **
79745 -** This file is part of the plugins of the Qt Toolkit. 79745 -** This file is part of the plugins of the Qt Toolkit.
79746 +** This file is part of the QtCore module of the Qt Toolkit. 79746 +** This file is part of the QtCore module of the Qt Toolkit.
79747 ** 79747 **
79774 QT_END_NAMESPACE 79774 QT_END_NAMESPACE
79775 79775
79776 -#endif // QJISCODEC_H 79776 -#endif // QJISCODEC_H
79777 +#endif // QJISCODEC_P_H 79777 +#endif // QJISCODEC_P_H
79778 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 79778 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
79779 index 240af89..ffe6b3f 100644 79779 index 304d26e..0c24168 100644
79780 --- a/src/corelib/codecs/qjpunicode.cpp 79780 --- a/src/corelib/codecs/qjpunicode.cpp
79781 +++ b/src/corelib/codecs/qjpunicode.cpp 79781 +++ b/src/corelib/codecs/qjpunicode.cpp
79782 @@ -3,7 +3,7 @@ 79782 @@ -3,7 +3,7 @@
79783 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79783 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79784 ** Contact: http://www.qt-project.org/legal 79784 ** Contact: http://www.qt-project.org/legal
79785 ** 79785 **
79786 -** This file is part of the plugins of the Qt Toolkit. 79786 -** This file is part of the plugins of the Qt Toolkit.
79787 +** This file is part of the QtCore module of the Qt Toolkit. 79787 +** This file is part of the QtCore module of the Qt Toolkit.
79788 ** 79788 **
79789 ** $QT_BEGIN_LICENSE:LGPL$ 79789 ** $QT_BEGIN_LICENSE:LGPL$
79790 ** Commercial License Usage 79790 ** Commercial License Usage
79791 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h 79791 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
79792 index 1e7af75..da45ceb 100644 79792 index 83bb8e1..9497911 100644
79793 --- a/src/corelib/codecs/qjpunicode_p.h 79793 --- a/src/corelib/codecs/qjpunicode_p.h
79794 +++ b/src/corelib/codecs/qjpunicode_p.h 79794 +++ b/src/corelib/codecs/qjpunicode_p.h
79795 @@ -3,7 +3,7 @@ 79795 @@ -3,7 +3,7 @@
79796 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79796 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79797 ** Contact: http://www.qt-project.org/legal 79797 ** Contact: http://www.qt-project.org/legal
79798 ** 79798 **
79799 -** This file is part of the plugins of the Qt Toolkit. 79799 -** This file is part of the plugins of the Qt Toolkit.
79800 +** This file is part of the QtCore module of the Qt Toolkit. 79800 +** This file is part of the QtCore module of the Qt Toolkit.
79801 ** 79801 **
79828 QT_END_NAMESPACE 79828 QT_END_NAMESPACE
79829 79829
79830 -#endif // QJPUNICODE_H 79830 -#endif // QJPUNICODE_H
79831 +#endif // QJPUNICODE_P_H 79831 +#endif // QJPUNICODE_P_H
79832 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 79832 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
79833 index 8519147..fdb94f6 100644 79833 index 5c69748..cc87d1a 100644
79834 --- a/src/corelib/codecs/qsjiscodec.cpp 79834 --- a/src/corelib/codecs/qsjiscodec.cpp
79835 +++ b/src/corelib/codecs/qsjiscodec.cpp 79835 +++ b/src/corelib/codecs/qsjiscodec.cpp
79836 @@ -3,7 +3,7 @@ 79836 @@ -3,7 +3,7 @@
79837 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79837 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79838 ** Contact: http://www.qt-project.org/legal 79838 ** Contact: http://www.qt-project.org/legal
79839 ** 79839 **
79840 -** This file is part of the plugins of the Qt Toolkit. 79840 -** This file is part of the plugins of the Qt Toolkit.
79841 +** This file is part of the QtCore module of the Qt Toolkit. 79841 +** This file is part of the QtCore module of the Qt Toolkit.
79842 ** 79842 **
79843 ** $QT_BEGIN_LICENSE:LGPL$ 79843 ** $QT_BEGIN_LICENSE:LGPL$
79844 ** Commercial License Usage 79844 ** Commercial License Usage
79845 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 79845 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
79846 index c1e4689..d5cbd74 100644 79846 index 5025968..6dd8902 100644
79847 --- a/src/corelib/codecs/qsjiscodec_p.h 79847 --- a/src/corelib/codecs/qsjiscodec_p.h
79848 +++ b/src/corelib/codecs/qsjiscodec_p.h 79848 +++ b/src/corelib/codecs/qsjiscodec_p.h
79849 @@ -3,7 +3,7 @@ 79849 @@ -3,7 +3,7 @@
79850 ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 79850 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
79851 ** Contact: http://www.qt-project.org/legal 79851 ** Contact: http://www.qt-project.org/legal
79852 ** 79852 **
79853 -** This file is part of the plugins of the Qt Toolkit. 79853 -** This file is part of the plugins of the Qt Toolkit.
79854 +** This file is part of the QtCore module of the Qt Toolkit. 79854 +** This file is part of the QtCore module of the Qt Toolkit.
79855 ** 79855 **
79882 QT_END_NAMESPACE 79882 QT_END_NAMESPACE
79883 79883
79884 -#endif // QSJISCODEC_H 79884 -#endif // QSJISCODEC_H
79885 +#endif // QSJISCODEC_P_H 79885 +#endif // QSJISCODEC_P_H
79886 -- 79886 --
79887 1.8.1.4 79887 1.8.5.2 (Apple Git-48)
79888 79888
79889 79889
79890 From d2258c0533b501f36842f99fc7e32d44e5321fd8 Mon Sep 17 00:00:00 2001 79890 From 6c3ced5e40b06c68ee50b297dcb7d3a3f5a63429 Mon Sep 17 00:00:00 2001
79891 From: Mark Brand <mabrand@mabrand.nl> 79891 From: Mark Brand <mabrand@mabrand.nl>
79892 Date: Thu, 12 Jan 2012 10:43:29 +0100 79892 Date: Thu, 12 Jan 2012 10:43:29 +0100
79893 Subject: [PATCH 08/17] remove obsolete codec plugin loading code 79893 Subject: [PATCH 08/17] remove obsolete codec plugin loading code
79894 79894
79895 backported from qt5/qtbase 79895 backported from qt5/qtbase
79931 - codecs/qtextcodecplugin.cpp \ 79931 - codecs/qtextcodecplugin.cpp \
79932 codecs/qgb18030codec.cpp \ 79932 codecs/qgb18030codec.cpp \
79933 codecs/qjpunicode.cpp \ 79933 codecs/qjpunicode.cpp \
79934 codecs/qeucjpcodec.cpp \ 79934 codecs/qeucjpcodec.cpp \
79935 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 79935 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
79936 index 2eaff80..85403dc 100644 79936 index 1376b67..efce435 100644
79937 --- a/src/corelib/codecs/qtextcodec.cpp 79937 --- a/src/corelib/codecs/qtextcodec.cpp
79938 +++ b/src/corelib/codecs/qtextcodec.cpp 79938 +++ b/src/corelib/codecs/qtextcodec.cpp
79939 @@ -48,11 +48,6 @@ 79939 @@ -48,11 +48,6 @@
79940 #include "qlist.h" 79940 #include "qlist.h"
79941 #include "qfile.h" 79941 #include "qfile.h"
80079 return codecs; 80079 return codecs;
80080 } 80080 }
80081 80081
80082 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp 80082 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp
80083 deleted file mode 100644 80083 deleted file mode 100644
80084 index a2102f2..0000000 80084 index 6cfa84e..0000000
80085 --- a/src/corelib/codecs/qtextcodecplugin.cpp 80085 --- a/src/corelib/codecs/qtextcodecplugin.cpp
80086 +++ /dev/null 80086 +++ /dev/null
80087 @@ -1,161 +0,0 @@ 80087 @@ -1,161 +0,0 @@
80088 -/**************************************************************************** 80088 -/****************************************************************************
80089 -** 80089 -**
80090 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 80090 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
80091 -** Contact: http://www.qt-project.org/legal 80091 -** Contact: http://www.qt-project.org/legal
80092 -** 80092 -**
80093 -** This file is part of the QtCore module of the Qt Toolkit. 80093 -** This file is part of the QtCore module of the Qt Toolkit.
80094 -** 80094 -**
80095 -** $QT_BEGIN_LICENSE:LGPL$ 80095 -** $QT_BEGIN_LICENSE:LGPL$
80246 -QT_END_NAMESPACE 80246 -QT_END_NAMESPACE
80247 - 80247 -
80248 -#endif // QT_NO_TEXTCODECPLUGIN 80248 -#endif // QT_NO_TEXTCODECPLUGIN
80249 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h 80249 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h
80250 deleted file mode 100644 80250 deleted file mode 100644
80251 index 8c7fae6..0000000 80251 index 3258207..0000000
80252 --- a/src/corelib/codecs/qtextcodecplugin.h 80252 --- a/src/corelib/codecs/qtextcodecplugin.h
80253 +++ /dev/null 80253 +++ /dev/null
80254 @@ -1,96 +0,0 @@ 80254 @@ -1,96 +0,0 @@
80255 -/**************************************************************************** 80255 -/****************************************************************************
80256 -** 80256 -**
80257 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). 80257 -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
80258 -** Contact: http://www.qt-project.org/legal 80258 -** Contact: http://www.qt-project.org/legal
80259 -** 80259 -**
80260 -** This file is part of the QtCore module of the Qt Toolkit. 80260 -** This file is part of the QtCore module of the Qt Toolkit.
80261 -** 80261 -**
80262 -** $QT_BEGIN_LICENSE:LGPL$ 80262 -** $QT_BEGIN_LICENSE:LGPL$
80347 - 80347 -
80348 -QT_END_HEADER 80348 -QT_END_HEADER
80349 - 80349 -
80350 -#endif // QTEXTCODECPLUGIN_H 80350 -#endif // QTEXTCODECPLUGIN_H
80351 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h 80351 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
80352 index 5547736..60909d5 100644 80352 index b23f601..effe986 100644
80353 --- a/src/corelib/global/qconfig-medium.h 80353 --- a/src/corelib/global/qconfig-medium.h
80354 +++ b/src/corelib/global/qconfig-medium.h 80354 +++ b/src/corelib/global/qconfig-medium.h
80355 @@ -91,9 +91,6 @@ 80355 @@ -91,9 +91,6 @@
80356 #ifndef QT_NO_CODECS 80356 #ifndef QT_NO_CODECS
80357 # define QT_NO_CODECS 80357 # define QT_NO_CODECS
80361 -#endif 80361 -#endif
80362 #ifndef QT_NO_TRANSLATION 80362 #ifndef QT_NO_TRANSLATION
80363 # define QT_NO_TRANSLATION 80363 # define QT_NO_TRANSLATION
80364 #endif 80364 #endif
80365 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h 80365 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
80366 index 36e3401..7edf746 100644 80366 index 54f7a31..af4bd5f 100644
80367 --- a/src/corelib/global/qconfig-minimal.h 80367 --- a/src/corelib/global/qconfig-minimal.h
80368 +++ b/src/corelib/global/qconfig-minimal.h 80368 +++ b/src/corelib/global/qconfig-minimal.h
80369 @@ -167,9 +167,6 @@ 80369 @@ -167,9 +167,6 @@
80370 #ifndef QT_NO_CODECS 80370 #ifndef QT_NO_CODECS
80371 # define QT_NO_CODECS 80371 # define QT_NO_CODECS
80375 -#endif 80375 -#endif
80376 #ifndef QT_NO_TRANSLATION 80376 #ifndef QT_NO_TRANSLATION
80377 # define QT_NO_TRANSLATION 80377 # define QT_NO_TRANSLATION
80378 #endif 80378 #endif
80379 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h 80379 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
80380 index 446a98a..f760761 100644 80380 index adeb249..d18797b 100644
80381 --- a/src/corelib/global/qconfig-nacl.h 80381 --- a/src/corelib/global/qconfig-nacl.h
80382 +++ b/src/corelib/global/qconfig-nacl.h 80382 +++ b/src/corelib/global/qconfig-nacl.h
80383 @@ -128,9 +128,6 @@ 80383 @@ -128,9 +128,6 @@
80384 #ifndef QT_NO_CODECS 80384 #ifndef QT_NO_CODECS
80385 # define QT_NO_CODECS 80385 # define QT_NO_CODECS
80389 -#endif 80389 -#endif
80390 #ifndef QT_NO_TRANSLATION 80390 #ifndef QT_NO_TRANSLATION
80391 # define QT_NO_TRANSLATION 80391 # define QT_NO_TRANSLATION
80392 #endif 80392 #endif
80393 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h 80393 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
80394 index 8e41875..f4d651b 100644 80394 index d602fb5..957d7ee 100644
80395 --- a/src/corelib/global/qconfig-small.h 80395 --- a/src/corelib/global/qconfig-small.h
80396 +++ b/src/corelib/global/qconfig-small.h 80396 +++ b/src/corelib/global/qconfig-small.h
80397 @@ -128,9 +128,6 @@ 80397 @@ -128,9 +128,6 @@
80398 #ifndef QT_NO_CODECS 80398 #ifndef QT_NO_CODECS
80399 # define QT_NO_CODECS 80399 # define QT_NO_CODECS
80403 -#endif 80403 -#endif
80404 #ifndef QT_NO_TRANSLATION 80404 #ifndef QT_NO_TRANSLATION
80405 # define QT_NO_TRANSLATION 80405 # define QT_NO_TRANSLATION
80406 #endif 80406 #endif
80407 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h 80407 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
80408 index 1642947..36c09f1 100644 80408 index 038912f..437d4f2 100644
80409 --- a/src/corelib/global/qfeatures.h 80409 --- a/src/corelib/global/qfeatures.h
80410 +++ b/src/corelib/global/qfeatures.h 80410 +++ b/src/corelib/global/qfeatures.h
80411 @@ -643,11 +643,6 @@ 80411 @@ -643,11 +643,6 @@
80412 #define QT_NO_TABDIALOG 80412 #define QT_NO_TABDIALOG
80413 #endif 80413 #endif
80419 - 80419 -
80420 // QColorDialog 80420 // QColorDialog
80421 #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) 80421 #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
80422 #define QT_NO_COLORDIALOG 80422 #define QT_NO_COLORDIALOG
80423 -- 80423 --
80424 1.8.1.4 80424 1.8.5.2 (Apple Git-48)
80425 80425
80426 80426
80427 From 18bb9c4ba6b8d08af061a5465da5db16260a309d Mon Sep 17 00:00:00 2001 80427 From c60cb4f5cedaddc7b951cf57c3f5a55916d2c830 Mon Sep 17 00:00:00 2001
80428 From: Mark Brand <mabrand@mabrand.nl> 80428 From: Mark Brand <mabrand@mabrand.nl>
80429 Date: Mon, 23 Jan 2012 23:12:46 +0100 80429 Date: Mon, 23 Jan 2012 23:12:46 +0100
80430 Subject: [PATCH 09/17] remove vestiges of text codec plugins 80430 Subject: [PATCH 09/17] remove vestiges of text codec plugins
80431 80431
80432 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df 80432 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
80453 - 80453 -
80454 Feature: TRANSLATION 80454 Feature: TRANSLATION
80455 Description: Supports translations using QObject::tr(). 80455 Description: Supports translations using QObject::tr().
80456 Section: Internationalization 80456 Section: Internationalization
80457 -- 80457 --
80458 1.8.1.4 80458 1.8.5.2 (Apple Git-48)
80459 80459
80460 80460
80461 From 4fc126e7430559acb80a5c8891d5f237be0409b3 Mon Sep 17 00:00:00 2001 80461 From 2e5dd882e30f4568fab102e65bbb9663451e22bc Mon Sep 17 00:00:00 2001
80462 From: Mark Brand <mabrand@mabrand.nl> 80462 From: Mark Brand <mabrand@mabrand.nl>
80463 Date: Thu, 3 Nov 2011 15:10:26 +0100 80463 Date: Thu, 3 Nov 2011 15:10:26 +0100
80464 Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific) 80464 Subject: [PATCH 10/17] use pkg-config for libmng (MXE specific)
80465 80465
80466 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4 80466 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
80479 + if(unix|win32-g++*):LIBS *= -lmng 80479 + if(unix|win32-g++*):LIBS *= -lmng
80480 else:win32: LIBS += libmng.lib 80480 else:win32: LIBS += libmng.lib
80481 } else { 80481 } else {
80482 include($$PWD/../../3rdparty/libmng.pri) 80482 include($$PWD/../../3rdparty/libmng.pri)
80483 -- 80483 --
80484 1.8.1.4 80484 1.8.5.2 (Apple Git-48)
80485 80485
80486 80486
80487 From 2e6ae6495c5ec5a52b4de2473a6a6ad7b1e0fbb2 Mon Sep 17 00:00:00 2001 80487 From 664cbb6e0a0ee4ad68ec4f940a698f171e5cbc9f Mon Sep 17 00:00:00 2001
80488 From: Mark Brand <mabrand@mabrand.nl> 80488 From: Mark Brand <mabrand@mabrand.nl>
80489 Date: Thu, 3 Nov 2011 14:11:02 +0100 80489 Date: Thu, 3 Nov 2011 14:11:02 +0100
80490 Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific) 80490 Subject: [PATCH 11/17] use pkg-config for libtiff-4 (MXE specific)
80491 80491
80492 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957 80492 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
80505 + if(unix|win32-g++*):LIBS *= -ltiff 80505 + if(unix|win32-g++*):LIBS *= -ltiff
80506 else:win32: LIBS += libtiff.lib 80506 else:win32: LIBS += libtiff.lib
80507 } else { 80507 } else {
80508 include($$PWD/../../3rdparty/libtiff.pri) 80508 include($$PWD/../../3rdparty/libtiff.pri)
80509 -- 80509 --
80510 1.8.1.4 80510 1.8.5.2 (Apple Git-48)
80511 80511
80512 80512
80513 From 7040eedeada1f2e73e76b6ced8badd403138ed62 Mon Sep 17 00:00:00 2001 80513 From 2cd7578f3872cea2a849dd42b5155133278c80a9 Mon Sep 17 00:00:00 2001
80514 From: Mark Brand <mabrand@mabrand.nl>
80515 Date: Sat, 5 Jun 2010 23:41:04 +0200
80516 Subject: [PATCH 12/17] restore support for static linking of QtWebKit (MXE
80517 specific)
80518
80519 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
80520
80521 For static Qt on win32-g++*, applications using webkit link to jscore and webcore.
80522
80523 Added INSTALLS and pkg-config for static jscore and webcore.
80524
80525 Don't build Qt WebKit tests to avoid static linking problems.
80526
80527 Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da
80528
80529 diff --git a/configure b/configure
80530 index e337dc0..e54782e 100755
80531 --- a/configure
80532 +++ b/configure
80533 @@ -7769,12 +7769,6 @@ if [ "$CFG_GUI" = "no" ]; then
80534 canBuildWebKit="no"
80535 fi
80536
80537 -if [ "$CFG_SHARED" = "no" ]; then
80538 - echo
80539 - echo "WARNING: Using static linking will disable the WebKit module."
80540 - echo
80541 - canBuildWebKit="no"
80542 -fi
80543
80544 CFG_CONCURRENT="yes"
80545 if [ "$canBuildQtConcurrent" = "no" ]; then
80546 diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
80547 index d8290cf..28080f9 100644
80548 --- a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
80549 +++ b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
80550 @@ -109,3 +109,15 @@ defineTest(prependJavaScriptCoreLib) {
80551 return(true)
80552 }
80553
80554 +static {
80555 + # applications must link to static libjscore
80556 + target.path = $$[QT_INSTALL_LIBS]
80557 + INSTALLS += target
80558 +
80559 + CONFIG += create_pc
80560 + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
80561 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
80562 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
80563 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig
80564 +}
80565 +
80566 diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
80567 index d83eec7..33c0b1f 100644
80568 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
80569 +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
80570 @@ -365,3 +365,15 @@ defineTest(prependWebCoreLib) {
80571
80572 return(true)
80573 }
80574 +
80575 +static {
80576 + # applications must link to static libwebcore
80577 + target.path = $$[QT_INSTALL_LIBS]
80578 + INSTALLS += target
80579 +
80580 + CONFIG += create_pc
80581 + QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
80582 + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
80583 + QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
80584 + QMAKE_PKGCONFIG_DESTDIR = pkgconfig
80585 +}
80586 diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
80587 index ceceee8..6609944 100644
80588 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro
80589 +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
80590 @@ -16,7 +16,7 @@ CONFIG += staticlib
80591 DESTDIR = $$WEBCORE_DESTDIR
80592
80593 DEFINES += BUILDING_WEBKIT
80594 -DEFINES += QT_MAKEDLL
80595 +!static:DEFINES += QT_MAKEDLL
80596
80597 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
80598 DEFINES += ENABLE_NO_LISTBOX_RENDERING=1
80599 diff --git a/src/3rdparty/webkit/Source/WebKit.pro b/src/3rdparty/webkit/Source/WebKit.pro
80600 index 9be0f4a..6744f58 100644
80601 --- a/src/3rdparty/webkit/Source/WebKit.pro
80602 +++ b/src/3rdparty/webkit/Source/WebKit.pro
80603 @@ -22,7 +22,7 @@ contains(QT_CONFIG, declarative) {
80604 exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
80605 }
80606
80607 -exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
80608 +#exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
80609
80610 build-qtscript {
80611 SUBDIRS += \
80612 --
80613 1.8.1.4
80614
80615
80616 From 63506d7ad0ce09e8d1a28db6b76324c4a7576ed4 Mon Sep 17 00:00:00 2001
80617 From: Tony Theodore <tonyt@logyst.com> 80514 From: Tony Theodore <tonyt@logyst.com>
80618 Date: Thu, 1 Sep 2011 13:47:10 +0200 80515 Date: Thu, 1 Sep 2011 13:47:10 +0200
80619 Subject: [PATCH 13/17] fix building on GNU/kFreeBSD (MXE specific) 80516 Subject: [PATCH 12/17] fix building on GNU/kFreeBSD (MXE specific)
80620 80517
80621 This patch has been taken from: 80518 This patch has been taken from:
80622 80519
80623 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/patches/50_kfreebsd_Q_OS.diff;h=4a8db71ff07a91efdf822baa120a3542ccf1d7f2;hb=HEAD 80520 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/patches/50_kfreebsd_Q_OS.diff;h=4a8db71ff07a91efdf822baa120a3542ccf1d7f2;hb=HEAD
80624 80521
80626 Author: Pino Toscano <pino@kde.org> 80523 Author: Pino Toscano <pino@kde.org>
80627 Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL. 80524 Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
80628 Last-Update: 2010-10-06 80525 Last-Update: 2010-10-06
80629 80526
80630 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h 80527 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
80631 index e914ede..d4d06c8 100644 80528 index 799729c..2a76787 100644
80632 --- a/src/corelib/global/qglobal.h 80529 --- a/src/corelib/global/qglobal.h
80633 +++ b/src/corelib/global/qglobal.h 80530 +++ b/src/corelib/global/qglobal.h
80634 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {} 80531 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
80635 #elif defined(__FreeBSD__) || defined(__DragonFly__) 80532 #elif defined(__FreeBSD__) || defined(__DragonFly__)
80636 # define Q_OS_FREEBSD 80533 # define Q_OS_FREEBSD
80639 +# define Q_OS_FREEBSD_KERNEL 80536 +# define Q_OS_FREEBSD_KERNEL
80640 #elif defined(__NetBSD__) 80537 #elif defined(__NetBSD__)
80641 # define Q_OS_NETBSD 80538 # define Q_OS_NETBSD
80642 # define Q_OS_BSD4 80539 # define Q_OS_BSD4
80643 -- 80540 --
80644 1.8.1.4 80541 1.8.5.2 (Apple Git-48)
80645 80542
80646 80543
80647 From 7dda90d3a9e0bb86bea079a225e245f031d2de36 Mon Sep 17 00:00:00 2001 80544 From b3713a30b270cb5998f617b3e726d9ea985068da Mon Sep 17 00:00:00 2001
80648 From: Tony Theodore <tonyt@logyst.com> 80545 From: Tony Theodore <tonyt@logyst.com>
80649 Date: Thu, 1 Sep 2011 13:49:47 +0200 80546 Date: Thu, 1 Sep 2011 13:49:47 +0200
80650 Subject: [PATCH 14/17] fix missing platform when building on GNU/kFreeBSD (MXE 80547 Subject: [PATCH 13/17] fix missing platform when building on GNU/kFreeBSD (MXE
80651 specific) 80548 specific)
80652 80549
80653 This patch is inspired by: 80550 This patch is inspired by:
80654 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD 80551 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD
80655 80552
80656 For the time being, glibc-g++ is simply a copy of linux-g++. 80553 For the time being, glibc-g++ is simply a copy of linux-g++.
80657 80554
80658 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95 80555 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95
80659 80556
80660 diff --git a/configure b/configure 80557 diff --git a/configure b/configure
80661 index e54782e..707f55a 100755 80558 index 2e495a4..4965d90 100755
80662 --- a/configure 80559 --- a/configure
80663 +++ b/configure 80560 +++ b/configure
80664 @@ -2877,6 +2877,9 @@ if [ -z "$PLATFORM" ]; then 80561 @@ -2877,6 +2877,9 @@ if [ -z "$PLATFORM" ]; then
80665 GNU:*) 80562 GNU:*)
80666 PLATFORM=hurd-g++ 80563 PLATFORM=hurd-g++
80670 + ;; 80567 + ;;
80671 dgux:*) 80568 dgux:*)
80672 PLATFORM=dgux-g++ 80569 PLATFORM=dgux-g++
80673 ;; 80570 ;;
80674 -- 80571 --
80675 1.8.1.4 80572 1.8.5.2 (Apple Git-48)
80676 80573
80677 80574
80678 From 9c9244e24c767378429c70b6b85198fd8e91718f Mon Sep 17 00:00:00 2001 80575 From 0c3ab6553ae4834100f864e0bc636ae23f22988a Mon Sep 17 00:00:00 2001
80679 From: Tony Theodore <tonyt@logyst.com> 80576 From: Tony Theodore <tonyt@logyst.com>
80680 Date: Thu, 1 Sep 2011 13:51:50 +0200 80577 Date: Thu, 1 Sep 2011 13:51:50 +0200
80681 Subject: [PATCH 15/17] fix building on dragonfly (MXE specific) 80578 Subject: [PATCH 14/17] fix building on dragonfly (MXE specific)
80682 80579
80683 This patch is inspired by: 80580 This patch is inspired by:
80684 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup 80581 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
80685 80582
80686 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d 80583 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d
80687 80584
80688 diff --git a/configure b/configure 80585 diff --git a/configure b/configure
80689 index 707f55a..8c48f51 100755 80586 index 4965d90..e1e7384 100755
80690 --- a/configure 80587 --- a/configure
80691 +++ b/configure 80588 +++ b/configure
80692 @@ -2889,7 +2889,7 @@ if [ -z "$PLATFORM" ]; then 80589 @@ -2889,7 +2889,7 @@ if [ -z "$PLATFORM" ]; then
80693 ULTRIX:*) 80590 ULTRIX:*)
80694 PLATFORM=ultrix-g++ 80591 PLATFORM=ultrix-g++
80697 + FreeBSD:*|DragonFly:*) 80594 + FreeBSD:*|DragonFly:*)
80698 PLATFORM=freebsd-g++ 80595 PLATFORM=freebsd-g++
80699 PLATFORM_NOTES=" 80596 PLATFORM_NOTES="
80700 - Also available for FreeBSD: freebsd-icc 80597 - Also available for FreeBSD: freebsd-icc
80701 -- 80598 --
80702 1.8.1.4 80599 1.8.5.2 (Apple Git-48)
80703 80600
80704 80601
80705 From 780cdd78482a95a44ae204588577e150e8c34ef3 Mon Sep 17 00:00:00 2001 80602 From dc91fc7307b24bf746005c83984e2d3bf6099af8 Mon Sep 17 00:00:00 2001
80706 From: Mark Brand <mabrand@mabrand.nl> 80603 From: Tony Theodore <tonyt@logyst.com>
80707 Date: Sat, 17 Aug 2013 20:34:36 +0200 80604 Date: Wed, 30 Apr 2014 22:12:35 +0200
80708 Subject: [PATCH 16/17] libmng 2 config.test compatibility 80605 Subject: [PATCH 15/17] fix for designer in shared build (MXE specific)
80709 80606
80710 Change-Id: I6de90a0f51087c7927bd978f605f4960d3f8ee87 80607 Change-Id: I23afe70c17e88d63b649d851f89e187da9b79d96
80711 80608
80712 diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp 80609 diff --git a/tools/designer/src/plugins/activeqt/activeqt.pro b/tools/designer/src/plugins/activeqt/activeqt.pro
80713 index 0fbe554..2559132 100644 80610 index f58df8a..0c25ed4 100644
80714 --- a/config.tests/unix/libmng/libmng.cpp 80611 --- a/tools/designer/src/plugins/activeqt/activeqt.pro
80715 +++ b/config.tests/unix/libmng/libmng.cpp 80612 +++ b/tools/designer/src/plugins/activeqt/activeqt.pro
80716 @@ -46,9 +46,11 @@ int main(int, char **) 80613 @@ -10,6 +10,8 @@ build_all:!build_pass {
80717 mng_handle hMNG;
80718 mng_cleanup(&hMNG);
80719 80614
80720 +#ifdef MNG_VERSION_MAJOR 80615 INCLUDEPATH += $$QT_SOURCE_TREE/src/activeqt/shared/ \
80721 #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9) 80616 $$QT_BUILD_TREE/src/activeqt/container \
80722 #error System libmng version is less than 1.0.9; using built-in version instead. 80617 + $$QT_BUILD_TREE/src/activeqt/container/.uic/release-shared \
80723 #endif 80618 + $$QT_BUILD_TREE/src/activeqt/container/.uic/debug-shared \
80724 +#endif 80619 ../../lib/uilib
80725 80620
80726 return 0; 80621 # Input
80727 }
80728 -- 80622 --
80729 1.8.1.4 80623 1.8.5.2 (Apple Git-48)
80730 80624
80731 80625
80732 From 1b3fcce36a1301406bf35507352de7205e49158a Mon Sep 17 00:00:00 2001 80626 From 5b44e1b9ac91a9f2647a7a870792cfb40a896ada Mon Sep 17 00:00:00 2001
80627 From: Mark Brand <mabrand@mabrand.nl>
80628 Date: Wed, 30 Apr 2014 23:17:58 +0200
80629 Subject: [PATCH 16/17] fix include of private header
80630
80631 Change-Id: I0554933de2536231d7d416d8df5b96eaa459fc51
80632 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
80633 (cherry picked from commit b7a67ca944ae5f16a03b2992e9f6989e5e831edc)
80634
80635 diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
80636 index e933112..3868c21 100644
80637 --- a/src/gui/dialogs/qfiledialog.cpp
80638 +++ b/src/gui/dialogs/qfiledialog.cpp
80639 @@ -58,7 +58,7 @@
80640 #include <qdebug.h>
80641 #include <qapplication.h>
80642 #include <qstylepainter.h>
80643 -#include <itemviews/qfileiconprovider_p.h>
80644 +#include <private/qfileiconprovider_p.h>
80645 #if !defined(Q_WS_WINCE) && !defined(Q_OS_SYMBIAN)
80646 #include "ui_qfiledialog.h"
80647 #else
80648 --
80649 1.8.5.2 (Apple Git-48)
80650
80651
80652 From a337b16522f513d387c93901c4a2e7da6d6eea22 Mon Sep 17 00:00:00 2001
80733 From: Tony Theodore <tonyt@logyst.com> 80653 From: Tony Theodore <tonyt@logyst.com>
80734 Date: Sat, 19 Oct 2013 19:37:30 +0200 80654 Date: Thu, 8 May 2014 00:24:25 +1000
80735 Subject: [PATCH 17/17] mingw-w64 compatibility 80655 Subject: [PATCH 17/17] fix include path with current dir
80736 80656
80737 taken from https://raw.github.com/ant32/pkgbuild/master/mingw-w64-qt4/qt-include-intrin-h-on-mingw-w64.patch
80738 80657
80739 Change-Id: I0f49c7f9d280dfacc33870643d39909cf0917d79 80658 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro b/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
80659 index 9e80870..98c7dad 100644
80660 --- a/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
80661 +++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/hybridPixmap/hybridPixmap.pro
80662 @@ -9,3 +9,4 @@ HEADERS += widget.h
80663 FORMS += widget.ui
80664 RESOURCES += resources.qrc
80665 CONFIG += console
80666 +INCLUDEPATH += .
80667 --
80668 1.8.5.2 (Apple Git-48)
80740 80669
80741 diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp
80742 index 540b615..dc95ac9 100644
80743 --- a/src/corelib/tools/qsimd.cpp
80744 +++ b/src/corelib/tools/qsimd.cpp
80745 @@ -47,7 +47,7 @@
80746 #include <windows.h>
80747 #endif
80748
80749 -#if defined(Q_OS_WIN64) && !defined(Q_CC_GNU)
80750 +#if defined(Q_OS_WIN64)
80751 #include <intrin.h>
80752 #endif
80753
80754 --
80755 1.8.1.4
80756