Mercurial > mxe-octave

comparison src/qt-1-cherrypicks.patch @ 2734:ffdcd0f515bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package qt
author Mark Brand <mabrand@mabrand.nl>
date Mon, 03 Sep 2012 17:13:09 +0200
parents be6a32dfbaea
children 61643b8b5122
comparison
equal deleted inserted replaced
2730:38054572b13f 2734:ffdcd0f515bc
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 7
8 From c9337a775daa3a53426403fdc6984656c0e08c29 Mon Sep 17 00:00:00 2001 8 From 2a376d8ff643ec0d40fdba68a25c3a323dbd5be4 Mon Sep 17 00:00:00 2001
9 From: Mark Brand <mabrand@mabrand.nl> 9 From: Mark Brand <mabrand@mabrand.nl>
10 Date: Fri, 13 Jan 2012 00:17:48 +0100 10 Date: Fri, 13 Jan 2012 00:17:48 +0100
11 Subject: [PATCH 01/15] remove trailing whitespace 11 Subject: [PATCH 01/23] remove trailing whitespace
12 12
13 backported from qt5/qtbase 13 backported from qt5/qtbase
14 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 14 Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6
15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 15 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
16 (cherry picked from commit 0f7a413683ab4358c4ded8bdffb7381459d98068) 16 (cherry picked from commit 0f7a413683ab4358c4ded8bdffb7381459d98068)
17 ---
18 src/corelib/codecs/codecs.pri | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20 17
21 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri 18 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
22 index 9090773..859ec8d 100644 19 index 9090773..859ec8d 100644
23 --- a/src/corelib/codecs/codecs.pri 20 --- a/src/corelib/codecs/codecs.pri
24 +++ b/src/corelib/codecs/codecs.pri 21 +++ b/src/corelib/codecs/codecs.pri
30 + ../plugins/codecs/jp/qsjiscodec.h \ 27 + ../plugins/codecs/jp/qsjiscodec.h \
31 ../plugins/codecs/kr/qeuckrcodec.h \ 28 ../plugins/codecs/kr/qeuckrcodec.h \
32 ../plugins/codecs/tw/qbig5codec.h \ 29 ../plugins/codecs/tw/qbig5codec.h \
33 ../plugins/codecs/jp/qfontjpcodec.h 30 ../plugins/codecs/jp/qfontjpcodec.h
34 -- 31 --
35 1.7.9.2 32 1.7.10.4
36 33
37 34
38 From 2afee6408f010376ede9f58aaee1fe4e23aa116d Mon Sep 17 00:00:00 2001 35 From f9650fb05bde43a8d710469daa363383e3947e3a Mon Sep 17 00:00:00 2001
39 From: Mark Brand <mabrand@mabrand.nl> 36 From: Mark Brand <mabrand@mabrand.nl>
40 Date: Thu, 30 Jun 2011 10:22:33 +0200 37 Date: Thu, 30 Jun 2011 10:22:33 +0200
41 Subject: [PATCH 02/15] do not detect or configure iconv for Windows 38 Subject: [PATCH 02/23] do not detect or configure iconv for Windows
42 39
43 Qt doesn't use iconv on Windows, but configuring it will appear to 40 Qt doesn't use iconv on Windows, but configuring it will appear to
44 work and the build will complete. The result is that character 41 work and the build will complete. The result is that character
45 set conversions do not work. 42 set conversions do not work.
46 43
49 backported from qt5/qtbase 46 backported from qt5/qtbase
50 Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf 47 Change-Id: I449a00860c2e77e6cdd8cdcf7108621c684207bf
51 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 48 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
52 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 49 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
53 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83) 50 (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83)
54 ---
55 configure | 2 +-
56 1 file changed, 1 insertion(+), 1 deletion(-)
57 51
58 diff --git a/configure b/configure 52 diff --git a/configure b/configure
59 index c1667b6..862aad5 100755 53 index d19f443..520ffc3 100755
60 --- a/configure 54 --- a/configure
61 +++ b/configure 55 +++ b/configure
62 @@ -5627,7 +5627,7 @@ fi 56 @@ -5682,7 +5682,7 @@ fi
63 57
64 # auto-detect iconv(3) support 58 # auto-detect iconv(3) support
65 if [ "$CFG_ICONV" != "no" ]; then 59 if [ "$CFG_ICONV" != "no" ]; then
66 - if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then 60 - if [ "$PLATFORM_QWS" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
67 + if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then 61 + if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
68 CFG_ICONV=no 62 CFG_ICONV=no
69 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then 63 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
70 CFG_ICONV=yes 64 CFG_ICONV=yes
71 -- 65 --
72 1.7.9.2 66 1.7.10.4
73 67
74 68
75 From f66200e240a3664dd62beb9eb8aa38efdecfddb1 Mon Sep 17 00:00:00 2001 69 From 04a44c0d6b3272c6edb08d34cecf36825843c2a0 Mon Sep 17 00:00:00 2001
76 From: Mark Brand <mabrand@mabrand.nl> 70 From: Mark Brand <mabrand@mabrand.nl>
77 Date: Wed, 18 Jan 2012 11:43:10 +0100 71 Date: Wed, 18 Jan 2012 11:43:10 +0100
78 Subject: [PATCH 03/15] fix whitespace 72 Subject: [PATCH 03/23] fix whitespace
79 73
80 backported from qt5/qtbase 74 backported from qt5/qtbase
81 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f 75 Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f
82 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 76 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
83 (cherry picked from commit 10f6c5981cd2373c73873f8bace0b2df42a01db8) 77 (cherry picked from commit 10f6c5981cd2373c73873f8bace0b2df42a01db8)
84 ---
85 src/corelib/codecs/codecs.pri | 33 ++++++++++++++++-----------------
86 1 file changed, 16 insertions(+), 17 deletions(-)
87 78
88 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri 79 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
89 index 859ec8d..70cd890 100644 80 index 859ec8d..70cd890 100644
90 --- a/src/corelib/codecs/codecs.pri 81 --- a/src/corelib/codecs/codecs.pri
91 +++ b/src/corelib/codecs/codecs.pri 82 +++ b/src/corelib/codecs/codecs.pri
144 + ../plugins/codecs/jp/qsjiscodec.cpp \ 135 + ../plugins/codecs/jp/qsjiscodec.cpp \
145 ../plugins/codecs/kr/qeuckrcodec.cpp \ 136 ../plugins/codecs/kr/qeuckrcodec.cpp \
146 ../plugins/codecs/tw/qbig5codec.cpp \ 137 ../plugins/codecs/tw/qbig5codec.cpp \
147 ../plugins/codecs/jp/qfontjpcodec.cpp 138 ../plugins/codecs/jp/qfontjpcodec.cpp
148 -- 139 --
149 1.7.9.2 140 1.7.10.4
150 141
151 142
152 From a82277bac5c8ac6fa43577bcc9642534714c91fb Mon Sep 17 00:00:00 2001 143 From 043a2cdc024dd19685a1cd3694faa0cdbade5a82 Mon Sep 17 00:00:00 2001
153 From: Mark Brand <mabrand@mabrand.nl> 144 From: Mark Brand <mabrand@mabrand.nl>
154 Date: Mon, 4 Jul 2011 00:42:24 +0200 145 Date: Mon, 4 Jul 2011 00:42:24 +0200
155 Subject: [PATCH 04/15] build and load text codecs regardless of iconv and 146 Subject: [PATCH 04/23] build and load text codecs regardless of iconv and
156 platform 147 platform
157 148
158 Otherwise applications linking to static Qt may have to import 149 Otherwise applications linking to static Qt may have to import
159 the static plugins to avoid linking failure even if they do not 150 the static plugins to avoid linking failure even if they do not
160 use the codecs, which is a nuisance. 151 use the codecs, which is a nuisance.
166 Change-Id: I71f3bbb0bac6261983143d0578757b34997d1364 157 Change-Id: I71f3bbb0bac6261983143d0578757b34997d1364
167 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 158 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
168 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 159 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
169 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 160 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
170 (cherry picked from commit 7ee3d8c8ecb78dd7c5ae09b04ebf1420958f0001) 161 (cherry picked from commit 7ee3d8c8ecb78dd7c5ae09b04ebf1420958f0001)
171 ---
172 src/corelib/codecs/codecs.pri | 38 ++++++++++++++++++-------------------
173 src/corelib/codecs/qtextcodec.cpp | 14 +++++---------
174 2 files changed, 24 insertions(+), 28 deletions(-)
175 162
176 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri 163 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
177 index 70cd890..c847264 100644 164 index 70cd890..c847264 100644
178 --- a/src/corelib/codecs/codecs.pri 165 --- a/src/corelib/codecs/codecs.pri
179 +++ b/src/corelib/codecs/codecs.pri 166 +++ b/src/corelib/codecs/codecs.pri
235 - ../plugins/codecs/jp/qfontjpcodec.cpp 222 - ../plugins/codecs/jp/qfontjpcodec.cpp
236 } 223 }
237 } 224 }
238 symbian:LIBS += -lcharconv 225 symbian:LIBS += -lcharconv
239 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 226 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
240 index ea8a5fd..7966df2 100644 227 index 08d954c..f267acb 100644
241 --- a/src/corelib/codecs/qtextcodec.cpp 228 --- a/src/corelib/codecs/qtextcodec.cpp
242 +++ b/src/corelib/codecs/qtextcodec.cpp 229 +++ b/src/corelib/codecs/qtextcodec.cpp
243 @@ -66,15 +66,14 @@ 230 @@ -66,15 +66,14 @@
244 # include "qtsciicodec_p.h" 231 # include "qtsciicodec_p.h"
245 # include "qisciicodec_p.h" 232 # include "qisciicodec_p.h"
290 +# endif // !QT_BOOTSTRAPPED 277 +# endif // !QT_BOOTSTRAPPED
291 #endif //Q_OS_SYMBIAN 278 #endif //Q_OS_SYMBIAN
292 #endif // QT_NO_CODECS 279 #endif // QT_NO_CODECS
293 280
294 -- 281 --
295 1.7.9.2 282 1.7.10.4
296 283
297 284
298 From 1ec39e28f1790723df212eb158a6695c355a304a Mon Sep 17 00:00:00 2001 285 From c9e946e08850c2ea92c818bcef9b4f0ec47fb86f Mon Sep 17 00:00:00 2001
299 From: Mark Brand <mabrand@mabrand.nl> 286 From: Mark Brand <mabrand@mabrand.nl>
300 Date: Fri, 13 Jan 2012 00:24:13 +0100 287 Date: Fri, 13 Jan 2012 00:24:13 +0100
301 Subject: [PATCH 05/15] move plugin text codecs to QtCore 288 Subject: [PATCH 05/23] move plugin text codecs to QtCore
302 289
303 Having plugin text codecs adds considerable complexity to 290 Having plugin text codecs adds considerable complexity to
304 configuring Qt. The plugin interface is designed for optional 291 configuring Qt. The plugin interface is designed for optional
305 features, but text codecs tend to be used for essential functions. 292 features, but text codecs tend to be used for essential functions.
306 A dramatic example is loading a codec plugin from a file whose path 293 A dramatic example is loading a codec plugin from a file whose path
321 (cherry picked from commit 2ae91491b48a8684b3bba76664d82cedad92bfcd) 308 (cherry picked from commit 2ae91491b48a8684b3bba76664d82cedad92bfcd)
322 309
323 Conflicts: 310 Conflicts:
324 311
325 src/plugins/plugins.pro 312 src/plugins/plugins.pro
326 ---
327 src/corelib/codecs/codecs.pri | 32 +-
328 src/corelib/codecs/cp949codetbl_p.h | 637 ++
329 src/corelib/codecs/qbig5codec.cpp |12788 +++++++++++++++++++++++++++++++
330 src/corelib/codecs/qbig5codec_p.h | 124 +
331 src/corelib/codecs/qeucjpcodec.cpp | 261 +
332 src/corelib/codecs/qeucjpcodec_p.h | 106 +
333 src/corelib/codecs/qeuckrcodec.cpp | 3571 +++++++++
334 src/corelib/codecs/qeuckrcodec_p.h | 129 +
335 src/corelib/codecs/qfontjpcodec.cpp | 145 +
336 src/corelib/codecs/qfontjpcodec_p.h | 93 +
337 src/corelib/codecs/qgb18030codec.cpp | 9265 ++++++++++++++++++++++
338 src/corelib/codecs/qgb18030codec_p.h | 159 +
339 src/corelib/codecs/qjiscodec.cpp | 367 +
340 src/corelib/codecs/qjiscodec_p.h | 106 +
341 src/corelib/codecs/qjpunicode.cpp |10700 ++++++++++++++++++++++++++
342 src/corelib/codecs/qjpunicode_p.h | 174 +
343 src/corelib/codecs/qsjiscodec.cpp | 229 +
344 src/corelib/codecs/qsjiscodec_p.h | 106 +
345 src/corelib/codecs/qtextcodec.cpp | 14 +-
346 src/plugins/codecs/cn/cn.pro | 16 -
347 src/plugins/codecs/cn/main.cpp | 145 -
348 src/plugins/codecs/cn/qgb18030codec.cpp | 9265 ----------------------
349 src/plugins/codecs/cn/qgb18030codec.h | 159 -
350 src/plugins/codecs/codecs.pro | 4 -
351 src/plugins/codecs/jp/jp.pro | 27 -
352 src/plugins/codecs/jp/main.cpp | 149 -
353 src/plugins/codecs/jp/qeucjpcodec.cpp | 261 -
354 src/plugins/codecs/jp/qeucjpcodec.h | 106 -
355 src/plugins/codecs/jp/qfontjpcodec.cpp | 145 -
356 src/plugins/codecs/jp/qfontjpcodec.h | 93 -
357 src/plugins/codecs/jp/qjiscodec.cpp | 367 -
358 src/plugins/codecs/jp/qjiscodec.h | 106 -
359 src/plugins/codecs/jp/qjpunicode.cpp |10700 --------------------------
360 src/plugins/codecs/jp/qjpunicode.h | 174 -
361 src/plugins/codecs/jp/qsjiscodec.cpp | 229 -
362 src/plugins/codecs/jp/qsjiscodec.h | 106 -
363 src/plugins/codecs/kr/cp949codetbl.h | 637 --
364 src/plugins/codecs/kr/kr.pro | 20 -
365 src/plugins/codecs/kr/main.cpp | 131 -
366 src/plugins/codecs/kr/qeuckrcodec.cpp | 3571 ---------
367 src/plugins/codecs/kr/qeuckrcodec.h | 129 -
368 src/plugins/codecs/tw/main.cpp | 138 -
369 src/plugins/codecs/tw/qbig5codec.cpp |12788 -------------------------------
370 src/plugins/codecs/tw/qbig5codec.h | 124 -
371 src/plugins/codecs/tw/tw.pro | 16 -
372 src/plugins/plugins.pro | 5 -
373 46 files changed, 38984 insertions(+), 39633 deletions(-)
374 create mode 100644 src/corelib/codecs/cp949codetbl_p.h
375 create mode 100644 src/corelib/codecs/qbig5codec.cpp
376 create mode 100644 src/corelib/codecs/qbig5codec_p.h
377 create mode 100644 src/corelib/codecs/qeucjpcodec.cpp
378 create mode 100644 src/corelib/codecs/qeucjpcodec_p.h
379 create mode 100644 src/corelib/codecs/qeuckrcodec.cpp
380 create mode 100644 src/corelib/codecs/qeuckrcodec_p.h
381 create mode 100644 src/corelib/codecs/qfontjpcodec.cpp
382 create mode 100644 src/corelib/codecs/qfontjpcodec_p.h
383 create mode 100644 src/corelib/codecs/qgb18030codec.cpp
384 create mode 100644 src/corelib/codecs/qgb18030codec_p.h
385 create mode 100644 src/corelib/codecs/qjiscodec.cpp
386 create mode 100644 src/corelib/codecs/qjiscodec_p.h
387 create mode 100644 src/corelib/codecs/qjpunicode.cpp
388 create mode 100644 src/corelib/codecs/qjpunicode_p.h
389 create mode 100644 src/corelib/codecs/qsjiscodec.cpp
390 create mode 100644 src/corelib/codecs/qsjiscodec_p.h
391 delete mode 100644 src/plugins/codecs/cn/cn.pro
392 delete mode 100644 src/plugins/codecs/cn/main.cpp
393 delete mode 100644 src/plugins/codecs/cn/qgb18030codec.cpp
394 delete mode 100644 src/plugins/codecs/cn/qgb18030codec.h
395 delete mode 100644 src/plugins/codecs/codecs.pro
396 delete mode 100644 src/plugins/codecs/jp/jp.pro
397 delete mode 100644 src/plugins/codecs/jp/main.cpp
398 delete mode 100644 src/plugins/codecs/jp/qeucjpcodec.cpp
399 delete mode 100644 src/plugins/codecs/jp/qeucjpcodec.h
400 delete mode 100644 src/plugins/codecs/jp/qfontjpcodec.cpp
401 delete mode 100644 src/plugins/codecs/jp/qfontjpcodec.h
402 delete mode 100644 src/plugins/codecs/jp/qjiscodec.cpp
403 delete mode 100644 src/plugins/codecs/jp/qjiscodec.h
404 delete mode 100644 src/plugins/codecs/jp/qjpunicode.cpp
405 delete mode 100644 src/plugins/codecs/jp/qjpunicode.h
406 delete mode 100644 src/plugins/codecs/jp/qsjiscodec.cpp
407 delete mode 100644 src/plugins/codecs/jp/qsjiscodec.h
408 delete mode 100644 src/plugins/codecs/kr/cp949codetbl.h
409 delete mode 100644 src/plugins/codecs/kr/kr.pro
410 delete mode 100644 src/plugins/codecs/kr/main.cpp
411 delete mode 100644 src/plugins/codecs/kr/qeuckrcodec.cpp
412 delete mode 100644 src/plugins/codecs/kr/qeuckrcodec.h
413 delete mode 100644 src/plugins/codecs/tw/main.cpp
414 delete mode 100644 src/plugins/codecs/tw/qbig5codec.cpp
415 delete mode 100644 src/plugins/codecs/tw/qbig5codec.h
416 delete mode 100644 src/plugins/codecs/tw/tw.pro
417 313
418 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri 314 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
419 index c847264..a1271b9 100644 315 index c847264..a1271b9 100644
420 --- a/src/corelib/codecs/codecs.pri 316 --- a/src/corelib/codecs/codecs.pri
421 +++ b/src/corelib/codecs/codecs.pri 317 +++ b/src/corelib/codecs/codecs.pri
465 361
466 unix { 362 unix {
467 SOURCES += codecs/qfontlaocodec.cpp 363 SOURCES += codecs/qfontlaocodec.cpp
468 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h 364 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
469 new file mode 100644 365 new file mode 100644
470 index 0000000..25723c7 366 index 0000000..8bf9204
471 --- /dev/null 367 --- /dev/null
472 +++ b/src/corelib/codecs/cp949codetbl_p.h 368 +++ b/src/corelib/codecs/cp949codetbl_p.h
473 @@ -0,0 +1,637 @@ 369 @@ -0,0 +1,637 @@
474 +/**************************************************************************** 370 +/****************************************************************************
475 +** 371 +**
476 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 372 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
477 +** All rights reserved. 373 +** Contact: http://www.qt-project.org/
478 +** Contact: Nokia Corporation (qt-info@nokia.com)
479 +** 374 +**
480 +** This file is part of the plugins of the Qt Toolkit. 375 +** This file is part of the plugins of the Qt Toolkit.
481 +** 376 +**
482 +** $QT_BEGIN_LICENSE:LGPL$ 377 +** $QT_BEGIN_LICENSE:LGPL$
483 +** GNU Lesser General Public License Usage 378 +** GNU Lesser General Public License Usage
501 +** http://www.gnu.org/copyleft/gpl.html. 396 +** http://www.gnu.org/copyleft/gpl.html.
502 +** 397 +**
503 +** Other Usage 398 +** Other Usage
504 +** Alternatively, this file may be used in accordance with the terms and 399 +** Alternatively, this file may be used in accordance with the terms and
505 +** conditions contained in a signed written agreement between you and Nokia. 400 +** conditions contained in a signed written agreement between you and Nokia.
401 +**
506 +** 402 +**
507 +** 403 +**
508 +** 404 +**
509 +** 405 +**
510 +** 406 +**
1108 +}; 1004 +};
1109 + 1005 +
1110 +#endif // CP494CODETBL_H 1006 +#endif // CP494CODETBL_H
1111 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 1007 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
1112 new file mode 100644 1008 new file mode 100644
1113 index 0000000..e30861d 1009 index 0000000..662aee8
1114 --- /dev/null 1010 --- /dev/null
1115 +++ b/src/corelib/codecs/qbig5codec.cpp 1011 +++ b/src/corelib/codecs/qbig5codec.cpp
1116 @@ -0,0 +1,12788 @@ 1012 @@ -0,0 +1,12788 @@
1117 +/**************************************************************************** 1013 +/****************************************************************************
1118 +** 1014 +**
1119 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 1015 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
1120 +** All rights reserved. 1016 +** Contact: http://www.qt-project.org/
1121 +** Contact: Nokia Corporation (qt-info@nokia.com)
1122 +** 1017 +**
1123 +** This file is part of the plugins of the Qt Toolkit. 1018 +** This file is part of the plugins of the Qt Toolkit.
1124 +** 1019 +**
1125 +** $QT_BEGIN_LICENSE:LGPL$ 1020 +** $QT_BEGIN_LICENSE:LGPL$
1126 +** GNU Lesser General Public License Usage 1021 +** GNU Lesser General Public License Usage
1144 +** http://www.gnu.org/copyleft/gpl.html. 1039 +** http://www.gnu.org/copyleft/gpl.html.
1145 +** 1040 +**
1146 +** Other Usage 1041 +** Other Usage
1147 +** Alternatively, this file may be used in accordance with the terms and 1042 +** Alternatively, this file may be used in accordance with the terms and
1148 +** conditions contained in a signed written agreement between you and Nokia. 1043 +** conditions contained in a signed written agreement between you and Nokia.
1044 +**
1149 +** 1045 +**
1150 +** 1046 +**
1151 +** 1047 +**
1152 +** 1048 +**
1153 +** 1049 +**
13902 +#endif // QT_NO_TEXTCODEC 13798 +#endif // QT_NO_TEXTCODEC
13903 + 13799 +
13904 +QT_END_NAMESPACE 13800 +QT_END_NAMESPACE
13905 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h 13801 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
13906 new file mode 100644 13802 new file mode 100644
13907 index 0000000..f43b733 13803 index 0000000..eec1798
13908 --- /dev/null 13804 --- /dev/null
13909 +++ b/src/corelib/codecs/qbig5codec_p.h 13805 +++ b/src/corelib/codecs/qbig5codec_p.h
13910 @@ -0,0 +1,124 @@ 13806 @@ -0,0 +1,124 @@
13911 +/**************************************************************************** 13807 +/****************************************************************************
13912 +** 13808 +**
13913 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 13809 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
13914 +** All rights reserved. 13810 +** Contact: http://www.qt-project.org/
13915 +** Contact: Nokia Corporation (qt-info@nokia.com)
13916 +** 13811 +**
13917 +** This file is part of the plugins of the Qt Toolkit. 13812 +** This file is part of the plugins of the Qt Toolkit.
13918 +** 13813 +**
13919 +** $QT_BEGIN_LICENSE:LGPL$ 13814 +** $QT_BEGIN_LICENSE:LGPL$
13920 +** GNU Lesser General Public License Usage 13815 +** GNU Lesser General Public License Usage
13943 +** 13838 +**
13944 +** 13839 +**
13945 +** 13840 +**
13946 +** 13841 +**
13947 +** 13842 +**
13843 +**
13948 +** $QT_END_LICENSE$ 13844 +** $QT_END_LICENSE$
13949 +** 13845 +**
13950 +****************************************************************************/ 13846 +****************************************************************************/
13951 + 13847 +
13952 +// Most of the code here was originally written by Ming-Che Chuang and 13848 +// Most of the code here was originally written by Ming-Che Chuang and
14032 +QT_END_NAMESPACE 13928 +QT_END_NAMESPACE
14033 + 13929 +
14034 +#endif // QBIG5CODEC_H 13930 +#endif // QBIG5CODEC_H
14035 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 13931 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
14036 new file mode 100644 13932 new file mode 100644
14037 index 0000000..4ff5552 13933 index 0000000..69e314c
14038 --- /dev/null 13934 --- /dev/null
14039 +++ b/src/corelib/codecs/qeucjpcodec.cpp 13935 +++ b/src/corelib/codecs/qeucjpcodec.cpp
14040 @@ -0,0 +1,261 @@ 13936 @@ -0,0 +1,261 @@
14041 +/**************************************************************************** 13937 +/****************************************************************************
14042 +** 13938 +**
14043 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 13939 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
14044 +** All rights reserved. 13940 +** Contact: http://www.qt-project.org/
14045 +** Contact: Nokia Corporation (qt-info@nokia.com)
14046 +** 13941 +**
14047 +** This file is part of the plugins of the Qt Toolkit. 13942 +** This file is part of the plugins of the Qt Toolkit.
14048 +** 13943 +**
14049 +** $QT_BEGIN_LICENSE:LGPL$ 13944 +** $QT_BEGIN_LICENSE:LGPL$
14050 +** GNU Lesser General Public License Usage 13945 +** GNU Lesser General Public License Usage
14068 +** http://www.gnu.org/copyleft/gpl.html. 13963 +** http://www.gnu.org/copyleft/gpl.html.
14069 +** 13964 +**
14070 +** Other Usage 13965 +** Other Usage
14071 +** Alternatively, this file may be used in accordance with the terms and 13966 +** Alternatively, this file may be used in accordance with the terms and
14072 +** conditions contained in a signed written agreement between you and Nokia. 13967 +** conditions contained in a signed written agreement between you and Nokia.
13968 +**
14073 +** 13969 +**
14074 +** 13970 +**
14075 +** 13971 +**
14076 +** 13972 +**
14077 +** 13973 +**
14299 +#endif // QT_NO_TEXTCODEC 14195 +#endif // QT_NO_TEXTCODEC
14300 + 14196 +
14301 +QT_END_NAMESPACE 14197 +QT_END_NAMESPACE
14302 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 14198 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
14303 new file mode 100644 14199 new file mode 100644
14304 index 0000000..af02ed9 14200 index 0000000..d693e04
14305 --- /dev/null 14201 --- /dev/null
14306 +++ b/src/corelib/codecs/qeucjpcodec_p.h 14202 +++ b/src/corelib/codecs/qeucjpcodec_p.h
14307 @@ -0,0 +1,106 @@ 14203 @@ -0,0 +1,106 @@
14308 +/**************************************************************************** 14204 +/****************************************************************************
14309 +** 14205 +**
14310 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 14206 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
14311 +** All rights reserved. 14207 +** Contact: http://www.qt-project.org/
14312 +** Contact: Nokia Corporation (qt-info@nokia.com)
14313 +** 14208 +**
14314 +** This file is part of the plugins of the Qt Toolkit. 14209 +** This file is part of the plugins of the Qt Toolkit.
14315 +** 14210 +**
14316 +** $QT_BEGIN_LICENSE:LGPL$ 14211 +** $QT_BEGIN_LICENSE:LGPL$
14317 +** GNU Lesser General Public License Usage 14212 +** GNU Lesser General Public License Usage
14340 +** 14235 +**
14341 +** 14236 +**
14342 +** 14237 +**
14343 +** 14238 +**
14344 +** 14239 +**
14240 +**
14345 +** $QT_END_LICENSE$ 14241 +** $QT_END_LICENSE$
14346 +** 14242 +**
14347 +****************************************************************************/ 14243 +****************************************************************************/
14348 + 14244 +
14349 +// Most of the code here was originally written by Serika Kurusugawa 14245 +// Most of the code here was originally written by Serika Kurusugawa
14411 +QT_END_NAMESPACE 14307 +QT_END_NAMESPACE
14412 + 14308 +
14413 +#endif // QEUCJPCODEC_H 14309 +#endif // QEUCJPCODEC_H
14414 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 14310 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
14415 new file mode 100644 14311 new file mode 100644
14416 index 0000000..cc8fca8 14312 index 0000000..bef4132
14417 --- /dev/null 14313 --- /dev/null
14418 +++ b/src/corelib/codecs/qeuckrcodec.cpp 14314 +++ b/src/corelib/codecs/qeuckrcodec.cpp
14419 @@ -0,0 +1,3571 @@ 14315 @@ -0,0 +1,3571 @@
14420 +/**************************************************************************** 14316 +/****************************************************************************
14421 +** 14317 +**
14422 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 14318 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
14423 +** All rights reserved. 14319 +** Contact: http://www.qt-project.org/
14424 +** Contact: Nokia Corporation (qt-info@nokia.com)
14425 +** 14320 +**
14426 +** This file is part of the plugins of the Qt Toolkit. 14321 +** This file is part of the plugins of the Qt Toolkit.
14427 +** 14322 +**
14428 +** $QT_BEGIN_LICENSE:LGPL$ 14323 +** $QT_BEGIN_LICENSE:LGPL$
14429 +** GNU Lesser General Public License Usage 14324 +** GNU Lesser General Public License Usage
14447 +** http://www.gnu.org/copyleft/gpl.html. 14342 +** http://www.gnu.org/copyleft/gpl.html.
14448 +** 14343 +**
14449 +** Other Usage 14344 +** Other Usage
14450 +** Alternatively, this file may be used in accordance with the terms and 14345 +** Alternatively, this file may be used in accordance with the terms and
14451 +** conditions contained in a signed written agreement between you and Nokia. 14346 +** conditions contained in a signed written agreement between you and Nokia.
14347 +**
14452 +** 14348 +**
14453 +** 14349 +**
14454 +** 14350 +**
14455 +** 14351 +**
14456 +** 14352 +**
17988 +#endif // QT_NO_TEXTCODEC 17884 +#endif // QT_NO_TEXTCODEC
17989 + 17885 +
17990 +QT_END_NAMESPACE 17886 +QT_END_NAMESPACE
17991 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h 17887 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
17992 new file mode 100644 17888 new file mode 100644
17993 index 0000000..9408622 17889 index 0000000..55a1337
17994 --- /dev/null 17890 --- /dev/null
17995 +++ b/src/corelib/codecs/qeuckrcodec_p.h 17891 +++ b/src/corelib/codecs/qeuckrcodec_p.h
17996 @@ -0,0 +1,129 @@ 17892 @@ -0,0 +1,129 @@
17997 +/**************************************************************************** 17893 +/****************************************************************************
17998 +** 17894 +**
17999 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 17895 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
18000 +** All rights reserved. 17896 +** Contact: http://www.qt-project.org/
18001 +** Contact: Nokia Corporation (qt-info@nokia.com)
18002 +** 17897 +**
18003 +** This file is part of the plugins of the Qt Toolkit. 17898 +** This file is part of the plugins of the Qt Toolkit.
18004 +** 17899 +**
18005 +** $QT_BEGIN_LICENSE:LGPL$ 17900 +** $QT_BEGIN_LICENSE:LGPL$
18006 +** GNU Lesser General Public License Usage 17901 +** GNU Lesser General Public License Usage
18029 +** 17924 +**
18030 +** 17925 +**
18031 +** 17926 +**
18032 +** 17927 +**
18033 +** 17928 +**
17929 +**
18034 +** $QT_END_LICENSE$ 17930 +** $QT_END_LICENSE$
18035 +** 17931 +**
18036 +****************************************************************************/ 17932 +****************************************************************************/
18037 + 17933 +
18038 +/* 17934 +/*
18123 +QT_END_NAMESPACE 18019 +QT_END_NAMESPACE
18124 + 18020 +
18125 +#endif // QEUCKRCODEC_H 18021 +#endif // QEUCKRCODEC_H
18126 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 18022 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
18127 new file mode 100644 18023 new file mode 100644
18128 index 0000000..85eae20 18024 index 0000000..2ac3d6c
18129 --- /dev/null 18025 --- /dev/null
18130 +++ b/src/corelib/codecs/qfontjpcodec.cpp 18026 +++ b/src/corelib/codecs/qfontjpcodec.cpp
18131 @@ -0,0 +1,145 @@ 18027 @@ -0,0 +1,145 @@
18132 +/**************************************************************************** 18028 +/****************************************************************************
18133 +** 18029 +**
18134 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 18030 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
18135 +** All rights reserved. 18031 +** Contact: http://www.qt-project.org/
18136 +** Contact: Nokia Corporation (qt-info@nokia.com)
18137 +** 18032 +**
18138 +** This file is part of the plugins of the Qt Toolkit. 18033 +** This file is part of the plugins of the Qt Toolkit.
18139 +** 18034 +**
18140 +** $QT_BEGIN_LICENSE:LGPL$ 18035 +** $QT_BEGIN_LICENSE:LGPL$
18141 +** GNU Lesser General Public License Usage 18036 +** GNU Lesser General Public License Usage
18164 +** 18059 +**
18165 +** 18060 +**
18166 +** 18061 +**
18167 +** 18062 +**
18168 +** 18063 +**
18064 +**
18169 +** $QT_END_LICENSE$ 18065 +** $QT_END_LICENSE$
18170 +** 18066 +**
18171 +****************************************************************************/ 18067 +****************************************************************************/
18172 + 18068 +
18173 +#include "qfontjpcodec.h" 18069 +#include "qfontjpcodec.h"
18274 +#endif 18170 +#endif
18275 + 18171 +
18276 +QT_END_NAMESPACE 18172 +QT_END_NAMESPACE
18277 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h 18173 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
18278 new file mode 100644 18174 new file mode 100644
18279 index 0000000..6b2a6ee 18175 index 0000000..dfb06bb
18280 --- /dev/null 18176 --- /dev/null
18281 +++ b/src/corelib/codecs/qfontjpcodec_p.h 18177 +++ b/src/corelib/codecs/qfontjpcodec_p.h
18282 @@ -0,0 +1,93 @@ 18178 @@ -0,0 +1,93 @@
18283 +/**************************************************************************** 18179 +/****************************************************************************
18284 +** 18180 +**
18285 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 18181 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
18286 +** All rights reserved. 18182 +** Contact: http://www.qt-project.org/
18287 +** Contact: Nokia Corporation (qt-info@nokia.com)
18288 +** 18183 +**
18289 +** This file is part of the plugins of the Qt Toolkit. 18184 +** This file is part of the plugins of the Qt Toolkit.
18290 +** 18185 +**
18291 +** $QT_BEGIN_LICENSE:LGPL$ 18186 +** $QT_BEGIN_LICENSE:LGPL$
18292 +** GNU Lesser General Public License Usage 18187 +** GNU Lesser General Public License Usage
18315 +** 18210 +**
18316 +** 18211 +**
18317 +** 18212 +**
18318 +** 18213 +**
18319 +** 18214 +**
18215 +**
18320 +** $QT_END_LICENSE$ 18216 +** $QT_END_LICENSE$
18321 +** 18217 +**
18322 +****************************************************************************/ 18218 +****************************************************************************/
18323 + 18219 +
18324 +#ifndef QFONTJPCODEC_H 18220 +#ifndef QFONTJPCODEC_H
18373 +QT_END_NAMESPACE 18269 +QT_END_NAMESPACE
18374 + 18270 +
18375 +#endif // QFONTJPCODEC_H 18271 +#endif // QFONTJPCODEC_H
18376 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 18272 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
18377 new file mode 100644 18273 new file mode 100644
18378 index 0000000..760fcc0 18274 index 0000000..928bc52
18379 --- /dev/null 18275 --- /dev/null
18380 +++ b/src/corelib/codecs/qgb18030codec.cpp 18276 +++ b/src/corelib/codecs/qgb18030codec.cpp
18381 @@ -0,0 +1,9265 @@ 18277 @@ -0,0 +1,9265 @@
18382 +/**************************************************************************** 18278 +/****************************************************************************
18383 +** 18279 +**
18384 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 18280 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
18385 +** All rights reserved. 18281 +** Contact: http://www.qt-project.org/
18386 +** Contact: Nokia Corporation (qt-info@nokia.com)
18387 +** 18282 +**
18388 +** This file is part of the plugins of the Qt Toolkit. 18283 +** This file is part of the plugins of the Qt Toolkit.
18389 +** 18284 +**
18390 +** $QT_BEGIN_LICENSE:LGPL$ 18285 +** $QT_BEGIN_LICENSE:LGPL$
18391 +** GNU Lesser General Public License Usage 18286 +** GNU Lesser General Public License Usage
18409 +** http://www.gnu.org/copyleft/gpl.html. 18304 +** http://www.gnu.org/copyleft/gpl.html.
18410 +** 18305 +**
18411 +** Other Usage 18306 +** Other Usage
18412 +** Alternatively, this file may be used in accordance with the terms and 18307 +** Alternatively, this file may be used in accordance with the terms and
18413 +** conditions contained in a signed written agreement between you and Nokia. 18308 +** conditions contained in a signed written agreement between you and Nokia.
18309 +**
18414 +** 18310 +**
18415 +** 18311 +**
18416 +** 18312 +**
18417 +** 18313 +**
18418 +** 18314 +**
27644 +QT_END_NAMESPACE 27540 +QT_END_NAMESPACE
27645 + 27541 +
27646 +#endif // QT_NO_TEXTCODEC 27542 +#endif // QT_NO_TEXTCODEC
27647 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h 27543 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
27648 new file mode 100644 27544 new file mode 100644
27649 index 0000000..85047f3 27545 index 0000000..3e082bf
27650 --- /dev/null 27546 --- /dev/null
27651 +++ b/src/corelib/codecs/qgb18030codec_p.h 27547 +++ b/src/corelib/codecs/qgb18030codec_p.h
27652 @@ -0,0 +1,159 @@ 27548 @@ -0,0 +1,159 @@
27653 +/**************************************************************************** 27549 +/****************************************************************************
27654 +** 27550 +**
27655 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 27551 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
27656 +** All rights reserved. 27552 +** Contact: http://www.qt-project.org/
27657 +** Contact: Nokia Corporation (qt-info@nokia.com)
27658 +** 27553 +**
27659 +** This file is part of the plugins of the Qt Toolkit. 27554 +** This file is part of the plugins of the Qt Toolkit.
27660 +** 27555 +**
27661 +** $QT_BEGIN_LICENSE:LGPL$ 27556 +** $QT_BEGIN_LICENSE:LGPL$
27662 +** GNU Lesser General Public License Usage 27557 +** GNU Lesser General Public License Usage
27685 +** 27580 +**
27686 +** 27581 +**
27687 +** 27582 +**
27688 +** 27583 +**
27689 +** 27584 +**
27585 +**
27690 +** $QT_END_LICENSE$ 27586 +** $QT_END_LICENSE$
27691 +** 27587 +**
27692 +****************************************************************************/ 27588 +****************************************************************************/
27693 + 27589 +
27694 +// Contributed by James Su <suzhe@gnuchina.org> 27590 +// Contributed by James Su <suzhe@gnuchina.org>
27809 +QT_END_NAMESPACE 27705 +QT_END_NAMESPACE
27810 + 27706 +
27811 +#endif // QGB18030CODEC_H 27707 +#endif // QGB18030CODEC_H
27812 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 27708 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
27813 new file mode 100644 27709 new file mode 100644
27814 index 0000000..99c756e 27710 index 0000000..dd80541
27815 --- /dev/null 27711 --- /dev/null
27816 +++ b/src/corelib/codecs/qjiscodec.cpp 27712 +++ b/src/corelib/codecs/qjiscodec.cpp
27817 @@ -0,0 +1,367 @@ 27713 @@ -0,0 +1,367 @@
27818 +/**************************************************************************** 27714 +/****************************************************************************
27819 +** 27715 +**
27820 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 27716 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
27821 +** All rights reserved. 27717 +** Contact: http://www.qt-project.org/
27822 +** Contact: Nokia Corporation (qt-info@nokia.com)
27823 +** 27718 +**
27824 +** This file is part of the plugins of the Qt Toolkit. 27719 +** This file is part of the plugins of the Qt Toolkit.
27825 +** 27720 +**
27826 +** $QT_BEGIN_LICENSE:LGPL$ 27721 +** $QT_BEGIN_LICENSE:LGPL$
27827 +** GNU Lesser General Public License Usage 27722 +** GNU Lesser General Public License Usage
27845 +** http://www.gnu.org/copyleft/gpl.html. 27740 +** http://www.gnu.org/copyleft/gpl.html.
27846 +** 27741 +**
27847 +** Other Usage 27742 +** Other Usage
27848 +** Alternatively, this file may be used in accordance with the terms and 27743 +** Alternatively, this file may be used in accordance with the terms and
27849 +** conditions contained in a signed written agreement between you and Nokia. 27744 +** conditions contained in a signed written agreement between you and Nokia.
27745 +**
27850 +** 27746 +**
27851 +** 27747 +**
27852 +** 27748 +**
27853 +** 27749 +**
27854 +** 27750 +**
28182 +#endif // QT_NO_TEXTCODEC 28078 +#endif // QT_NO_TEXTCODEC
28183 + 28079 +
28184 +QT_END_NAMESPACE 28080 +QT_END_NAMESPACE
28185 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 28081 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
28186 new file mode 100644 28082 new file mode 100644
28187 index 0000000..aaf02a9 28083 index 0000000..dcdb04d
28188 --- /dev/null 28084 --- /dev/null
28189 +++ b/src/corelib/codecs/qjiscodec_p.h 28085 +++ b/src/corelib/codecs/qjiscodec_p.h
28190 @@ -0,0 +1,106 @@ 28086 @@ -0,0 +1,106 @@
28191 +/**************************************************************************** 28087 +/****************************************************************************
28192 +** 28088 +**
28193 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 28089 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
28194 +** All rights reserved. 28090 +** Contact: http://www.qt-project.org/
28195 +** Contact: Nokia Corporation (qt-info@nokia.com)
28196 +** 28091 +**
28197 +** This file is part of the plugins of the Qt Toolkit. 28092 +** This file is part of the plugins of the Qt Toolkit.
28198 +** 28093 +**
28199 +** $QT_BEGIN_LICENSE:LGPL$ 28094 +** $QT_BEGIN_LICENSE:LGPL$
28200 +** GNU Lesser General Public License Usage 28095 +** GNU Lesser General Public License Usage
28223 +** 28118 +**
28224 +** 28119 +**
28225 +** 28120 +**
28226 +** 28121 +**
28227 +** 28122 +**
28123 +**
28228 +** $QT_END_LICENSE$ 28124 +** $QT_END_LICENSE$
28229 +** 28125 +**
28230 +****************************************************************************/ 28126 +****************************************************************************/
28231 + 28127 +
28232 +// Most of the code here was originally written by Serika Kurusugawa 28128 +// Most of the code here was originally written by Serika Kurusugawa
28294 +QT_END_NAMESPACE 28190 +QT_END_NAMESPACE
28295 + 28191 +
28296 +#endif // QJISCODEC_H 28192 +#endif // QJISCODEC_H
28297 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 28193 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
28298 new file mode 100644 28194 new file mode 100644
28299 index 0000000..feb0f41 28195 index 0000000..ffd8829
28300 --- /dev/null 28196 --- /dev/null
28301 +++ b/src/corelib/codecs/qjpunicode.cpp 28197 +++ b/src/corelib/codecs/qjpunicode.cpp
28302 @@ -0,0 +1,10700 @@ 28198 @@ -0,0 +1,10700 @@
28303 +/**************************************************************************** 28199 +/****************************************************************************
28304 +** 28200 +**
28305 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 28201 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
28306 +** All rights reserved. 28202 +** Contact: http://www.qt-project.org/
28307 +** Contact: Nokia Corporation (qt-info@nokia.com)
28308 +** 28203 +**
28309 +** This file is part of the plugins of the Qt Toolkit. 28204 +** This file is part of the plugins of the Qt Toolkit.
28310 +** 28205 +**
28311 +** $QT_BEGIN_LICENSE:LGPL$ 28206 +** $QT_BEGIN_LICENSE:LGPL$
28312 +** GNU Lesser General Public License Usage 28207 +** GNU Lesser General Public License Usage
28330 +** http://www.gnu.org/copyleft/gpl.html. 28225 +** http://www.gnu.org/copyleft/gpl.html.
28331 +** 28226 +**
28332 +** Other Usage 28227 +** Other Usage
28333 +** Alternatively, this file may be used in accordance with the terms and 28228 +** Alternatively, this file may be used in accordance with the terms and
28334 +** conditions contained in a signed written agreement between you and Nokia. 28229 +** conditions contained in a signed written agreement between you and Nokia.
28230 +**
28335 +** 28231 +**
28336 +** 28232 +**
28337 +** 28233 +**
28338 +** 28234 +**
28339 +** 28235 +**
39000 +*/ 38896 +*/
39001 + 38897 +
39002 +QT_END_NAMESPACE 38898 +QT_END_NAMESPACE
39003 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h 38899 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
39004 new file mode 100644 38900 new file mode 100644
39005 index 0000000..069f49a 38901 index 0000000..a5bdd0c
39006 --- /dev/null 38902 --- /dev/null
39007 +++ b/src/corelib/codecs/qjpunicode_p.h 38903 +++ b/src/corelib/codecs/qjpunicode_p.h
39008 @@ -0,0 +1,174 @@ 38904 @@ -0,0 +1,174 @@
39009 +/**************************************************************************** 38905 +/****************************************************************************
39010 +** 38906 +**
39011 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 38907 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
39012 +** All rights reserved. 38908 +** Contact: http://www.qt-project.org/
39013 +** Contact: Nokia Corporation (qt-info@nokia.com)
39014 +** 38909 +**
39015 +** This file is part of the plugins of the Qt Toolkit. 38910 +** This file is part of the plugins of the Qt Toolkit.
39016 +** 38911 +**
39017 +** $QT_BEGIN_LICENSE:LGPL$ 38912 +** $QT_BEGIN_LICENSE:LGPL$
39018 +** GNU Lesser General Public License Usage 38913 +** GNU Lesser General Public License Usage
39041 +** 38936 +**
39042 +** 38937 +**
39043 +** 38938 +**
39044 +** 38939 +**
39045 +** 38940 +**
38941 +**
39046 +** $QT_END_LICENSE$ 38942 +** $QT_END_LICENSE$
39047 +** 38943 +**
39048 +****************************************************************************/ 38944 +****************************************************************************/
39049 + 38945 +
39050 +// Most of the code here was originally written by Serika Kurusugawa 38946 +// Most of the code here was originally written by Serika Kurusugawa
39180 +QT_END_NAMESPACE 39076 +QT_END_NAMESPACE
39181 + 39077 +
39182 +#endif // QJPUNICODE_H 39078 +#endif // QJPUNICODE_H
39183 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 39079 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
39184 new file mode 100644 39080 new file mode 100644
39185 index 0000000..ac89b33 39081 index 0000000..f03cd26
39186 --- /dev/null 39082 --- /dev/null
39187 +++ b/src/corelib/codecs/qsjiscodec.cpp 39083 +++ b/src/corelib/codecs/qsjiscodec.cpp
39188 @@ -0,0 +1,229 @@ 39084 @@ -0,0 +1,229 @@
39189 +/**************************************************************************** 39085 +/****************************************************************************
39190 +** 39086 +**
39191 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 39087 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
39192 +** All rights reserved. 39088 +** Contact: http://www.qt-project.org/
39193 +** Contact: Nokia Corporation (qt-info@nokia.com)
39194 +** 39089 +**
39195 +** This file is part of the plugins of the Qt Toolkit. 39090 +** This file is part of the plugins of the Qt Toolkit.
39196 +** 39091 +**
39197 +** $QT_BEGIN_LICENSE:LGPL$ 39092 +** $QT_BEGIN_LICENSE:LGPL$
39198 +** GNU Lesser General Public License Usage 39093 +** GNU Lesser General Public License Usage
39216 +** http://www.gnu.org/copyleft/gpl.html. 39111 +** http://www.gnu.org/copyleft/gpl.html.
39217 +** 39112 +**
39218 +** Other Usage 39113 +** Other Usage
39219 +** Alternatively, this file may be used in accordance with the terms and 39114 +** Alternatively, this file may be used in accordance with the terms and
39220 +** conditions contained in a signed written agreement between you and Nokia. 39115 +** conditions contained in a signed written agreement between you and Nokia.
39116 +**
39221 +** 39117 +**
39222 +** 39118 +**
39223 +** 39119 +**
39224 +** 39120 +**
39225 +** 39121 +**
39415 +#endif // QT_NO_TEXTCODEC 39311 +#endif // QT_NO_TEXTCODEC
39416 + 39312 +
39417 +QT_END_NAMESPACE 39313 +QT_END_NAMESPACE
39418 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 39314 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
39419 new file mode 100644 39315 new file mode 100644
39420 index 0000000..c56a103 39316 index 0000000..3d3cde7
39421 --- /dev/null 39317 --- /dev/null
39422 +++ b/src/corelib/codecs/qsjiscodec_p.h 39318 +++ b/src/corelib/codecs/qsjiscodec_p.h
39423 @@ -0,0 +1,106 @@ 39319 @@ -0,0 +1,106 @@
39424 +/**************************************************************************** 39320 +/****************************************************************************
39425 +** 39321 +**
39426 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 39322 +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
39427 +** All rights reserved. 39323 +** Contact: http://www.qt-project.org/
39428 +** Contact: Nokia Corporation (qt-info@nokia.com)
39429 +** 39324 +**
39430 +** This file is part of the plugins of the Qt Toolkit. 39325 +** This file is part of the plugins of the Qt Toolkit.
39431 +** 39326 +**
39432 +** $QT_BEGIN_LICENSE:LGPL$ 39327 +** $QT_BEGIN_LICENSE:LGPL$
39433 +** GNU Lesser General Public License Usage 39328 +** GNU Lesser General Public License Usage
39456 +** 39351 +**
39457 +** 39352 +**
39458 +** 39353 +**
39459 +** 39354 +**
39460 +** 39355 +**
39356 +**
39461 +** $QT_END_LICENSE$ 39357 +** $QT_END_LICENSE$
39462 +** 39358 +**
39463 +****************************************************************************/ 39359 +****************************************************************************/
39464 + 39360 +
39465 +// Most of the code here was originally written by Serika Kurusugawa 39361 +// Most of the code here was originally written by Serika Kurusugawa
39526 + 39422 +
39527 +QT_END_NAMESPACE 39423 +QT_END_NAMESPACE
39528 + 39424 +
39529 +#endif // QSJISCODEC_H 39425 +#endif // QSJISCODEC_H
39530 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 39426 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
39531 index 7966df2..3a2a60e 100644 39427 index f267acb..b6ed5e6 100644
39532 --- a/src/corelib/codecs/qtextcodec.cpp 39428 --- a/src/corelib/codecs/qtextcodec.cpp
39533 +++ b/src/corelib/codecs/qtextcodec.cpp 39429 +++ b/src/corelib/codecs/qtextcodec.cpp
39534 @@ -67,16 +67,16 @@ 39430 @@ -67,16 +67,16 @@
39535 # include "qisciicodec_p.h" 39431 # include "qisciicodec_p.h"
39536 #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) 39432 #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY)
39577 -INSTALLS += target 39473 -INSTALLS += target
39578 - 39474 -
39579 -symbian:TARGET.UID3=0x2001E615 39475 -symbian:TARGET.UID3=0x2001E615
39580 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp 39476 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp
39581 deleted file mode 100644 39477 deleted file mode 100644
39582 index cf42b97..0000000 39478 index 93b8b72..0000000
39583 --- a/src/plugins/codecs/cn/main.cpp 39479 --- a/src/plugins/codecs/cn/main.cpp
39584 +++ /dev/null 39480 +++ /dev/null
39585 @@ -1,145 +0,0 @@ 39481 @@ -1,145 +0,0 @@
39586 -/**************************************************************************** 39482 -/****************************************************************************
39587 -** 39483 -**
39588 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 39484 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
39589 -** All rights reserved. 39485 -** Contact: http://www.qt-project.org/
39590 -** Contact: Nokia Corporation (qt-info@nokia.com)
39591 -** 39486 -**
39592 -** This file is part of the plugins of the Qt Toolkit. 39487 -** This file is part of the plugins of the Qt Toolkit.
39593 -** 39488 -**
39594 -** $QT_BEGIN_LICENSE:LGPL$ 39489 -** $QT_BEGIN_LICENSE:LGPL$
39595 -** GNU Lesser General Public License Usage 39490 -** GNU Lesser General Public License Usage
39618 -** 39513 -**
39619 -** 39514 -**
39620 -** 39515 -**
39621 -** 39516 -**
39622 -** 39517 -**
39518 -**
39623 -** $QT_END_LICENSE$ 39519 -** $QT_END_LICENSE$
39624 -** 39520 -**
39625 -****************************************************************************/ 39521 -****************************************************************************/
39626 - 39522 -
39627 -#include <qtextcodecplugin.h> 39523 -#include <qtextcodecplugin.h>
39728 -QT_END_NAMESPACE 39624 -QT_END_NAMESPACE
39729 - 39625 -
39730 -#endif // QT_NO_TEXTCODECPLUGIN 39626 -#endif // QT_NO_TEXTCODECPLUGIN
39731 diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp 39627 diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp
39732 deleted file mode 100644 39628 deleted file mode 100644
39733 index 760fcc0..0000000 39629 index 928bc52..0000000
39734 --- a/src/plugins/codecs/cn/qgb18030codec.cpp 39630 --- a/src/plugins/codecs/cn/qgb18030codec.cpp
39735 +++ /dev/null 39631 +++ /dev/null
39736 @@ -1,9265 +0,0 @@ 39632 @@ -1,9265 +0,0 @@
39737 -/**************************************************************************** 39633 -/****************************************************************************
39738 -** 39634 -**
39739 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 39635 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
39740 -** All rights reserved. 39636 -** Contact: http://www.qt-project.org/
39741 -** Contact: Nokia Corporation (qt-info@nokia.com)
39742 -** 39637 -**
39743 -** This file is part of the plugins of the Qt Toolkit. 39638 -** This file is part of the plugins of the Qt Toolkit.
39744 -** 39639 -**
39745 -** $QT_BEGIN_LICENSE:LGPL$ 39640 -** $QT_BEGIN_LICENSE:LGPL$
39746 -** GNU Lesser General Public License Usage 39641 -** GNU Lesser General Public License Usage
39764 -** http://www.gnu.org/copyleft/gpl.html. 39659 -** http://www.gnu.org/copyleft/gpl.html.
39765 -** 39660 -**
39766 -** Other Usage 39661 -** Other Usage
39767 -** Alternatively, this file may be used in accordance with the terms and 39662 -** Alternatively, this file may be used in accordance with the terms and
39768 -** conditions contained in a signed written agreement between you and Nokia. 39663 -** conditions contained in a signed written agreement between you and Nokia.
39664 -**
39769 -** 39665 -**
39770 -** 39666 -**
39771 -** 39667 -**
39772 -** 39668 -**
39773 -** 39669 -**
48999 -QT_END_NAMESPACE 48895 -QT_END_NAMESPACE
49000 - 48896 -
49001 -#endif // QT_NO_TEXTCODEC 48897 -#endif // QT_NO_TEXTCODEC
49002 diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h 48898 diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h
49003 deleted file mode 100644 48899 deleted file mode 100644
49004 index 85047f3..0000000 48900 index 3e082bf..0000000
49005 --- a/src/plugins/codecs/cn/qgb18030codec.h 48901 --- a/src/plugins/codecs/cn/qgb18030codec.h
49006 +++ /dev/null 48902 +++ /dev/null
49007 @@ -1,159 +0,0 @@ 48903 @@ -1,159 +0,0 @@
49008 -/**************************************************************************** 48904 -/****************************************************************************
49009 -** 48905 -**
49010 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 48906 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49011 -** All rights reserved. 48907 -** Contact: http://www.qt-project.org/
49012 -** Contact: Nokia Corporation (qt-info@nokia.com)
49013 -** 48908 -**
49014 -** This file is part of the plugins of the Qt Toolkit. 48909 -** This file is part of the plugins of the Qt Toolkit.
49015 -** 48910 -**
49016 -** $QT_BEGIN_LICENSE:LGPL$ 48911 -** $QT_BEGIN_LICENSE:LGPL$
49017 -** GNU Lesser General Public License Usage 48912 -** GNU Lesser General Public License Usage
49040 -** 48935 -**
49041 -** 48936 -**
49042 -** 48937 -**
49043 -** 48938 -**
49044 -** 48939 -**
48940 -**
49045 -** $QT_END_LICENSE$ 48941 -** $QT_END_LICENSE$
49046 -** 48942 -**
49047 -****************************************************************************/ 48943 -****************************************************************************/
49048 - 48944 -
49049 -// Contributed by James Su <suzhe@gnuchina.org> 48945 -// Contributed by James Su <suzhe@gnuchina.org>
49207 -INSTALLS += target 49103 -INSTALLS += target
49208 - 49104 -
49209 -symbian:TARGET.UID3=0x2001E614 49105 -symbian:TARGET.UID3=0x2001E614
49210 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp 49106 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp
49211 deleted file mode 100644 49107 deleted file mode 100644
49212 index b372fb6..0000000 49108 index 6eee02f..0000000
49213 --- a/src/plugins/codecs/jp/main.cpp 49109 --- a/src/plugins/codecs/jp/main.cpp
49214 +++ /dev/null 49110 +++ /dev/null
49215 @@ -1,149 +0,0 @@ 49111 @@ -1,149 +0,0 @@
49216 -/**************************************************************************** 49112 -/****************************************************************************
49217 -** 49113 -**
49218 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49114 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49219 -** All rights reserved. 49115 -** Contact: http://www.qt-project.org/
49220 -** Contact: Nokia Corporation (qt-info@nokia.com)
49221 -** 49116 -**
49222 -** This file is part of the plugins of the Qt Toolkit. 49117 -** This file is part of the plugins of the Qt Toolkit.
49223 -** 49118 -**
49224 -** $QT_BEGIN_LICENSE:LGPL$ 49119 -** $QT_BEGIN_LICENSE:LGPL$
49225 -** GNU Lesser General Public License Usage 49120 -** GNU Lesser General Public License Usage
49248 -** 49143 -**
49249 -** 49144 -**
49250 -** 49145 -**
49251 -** 49146 -**
49252 -** 49147 -**
49148 -**
49253 -** $QT_END_LICENSE$ 49149 -** $QT_END_LICENSE$
49254 -** 49150 -**
49255 -****************************************************************************/ 49151 -****************************************************************************/
49256 - 49152 -
49257 -#include <qtextcodecplugin.h> 49153 -#include <qtextcodecplugin.h>
49362 -QT_END_NAMESPACE 49258 -QT_END_NAMESPACE
49363 - 49259 -
49364 -#endif // QT_NO_TEXTCODECPLUGIN 49260 -#endif // QT_NO_TEXTCODECPLUGIN
49365 diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp 49261 diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp
49366 deleted file mode 100644 49262 deleted file mode 100644
49367 index 4ff5552..0000000 49263 index 69e314c..0000000
49368 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp 49264 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp
49369 +++ /dev/null 49265 +++ /dev/null
49370 @@ -1,261 +0,0 @@ 49266 @@ -1,261 +0,0 @@
49371 -/**************************************************************************** 49267 -/****************************************************************************
49372 -** 49268 -**
49373 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49269 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49374 -** All rights reserved. 49270 -** Contact: http://www.qt-project.org/
49375 -** Contact: Nokia Corporation (qt-info@nokia.com)
49376 -** 49271 -**
49377 -** This file is part of the plugins of the Qt Toolkit. 49272 -** This file is part of the plugins of the Qt Toolkit.
49378 -** 49273 -**
49379 -** $QT_BEGIN_LICENSE:LGPL$ 49274 -** $QT_BEGIN_LICENSE:LGPL$
49380 -** GNU Lesser General Public License Usage 49275 -** GNU Lesser General Public License Usage
49398 -** http://www.gnu.org/copyleft/gpl.html. 49293 -** http://www.gnu.org/copyleft/gpl.html.
49399 -** 49294 -**
49400 -** Other Usage 49295 -** Other Usage
49401 -** Alternatively, this file may be used in accordance with the terms and 49296 -** Alternatively, this file may be used in accordance with the terms and
49402 -** conditions contained in a signed written agreement between you and Nokia. 49297 -** conditions contained in a signed written agreement between you and Nokia.
49298 -**
49403 -** 49299 -**
49404 -** 49300 -**
49405 -** 49301 -**
49406 -** 49302 -**
49407 -** 49303 -**
49629 -#endif // QT_NO_TEXTCODEC 49525 -#endif // QT_NO_TEXTCODEC
49630 - 49526 -
49631 -QT_END_NAMESPACE 49527 -QT_END_NAMESPACE
49632 diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h 49528 diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h
49633 deleted file mode 100644 49529 deleted file mode 100644
49634 index af02ed9..0000000 49530 index d693e04..0000000
49635 --- a/src/plugins/codecs/jp/qeucjpcodec.h 49531 --- a/src/plugins/codecs/jp/qeucjpcodec.h
49636 +++ /dev/null 49532 +++ /dev/null
49637 @@ -1,106 +0,0 @@ 49533 @@ -1,106 +0,0 @@
49638 -/**************************************************************************** 49534 -/****************************************************************************
49639 -** 49535 -**
49640 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49536 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49641 -** All rights reserved. 49537 -** Contact: http://www.qt-project.org/
49642 -** Contact: Nokia Corporation (qt-info@nokia.com)
49643 -** 49538 -**
49644 -** This file is part of the plugins of the Qt Toolkit. 49539 -** This file is part of the plugins of the Qt Toolkit.
49645 -** 49540 -**
49646 -** $QT_BEGIN_LICENSE:LGPL$ 49541 -** $QT_BEGIN_LICENSE:LGPL$
49647 -** GNU Lesser General Public License Usage 49542 -** GNU Lesser General Public License Usage
49670 -** 49565 -**
49671 -** 49566 -**
49672 -** 49567 -**
49673 -** 49568 -**
49674 -** 49569 -**
49570 -**
49675 -** $QT_END_LICENSE$ 49571 -** $QT_END_LICENSE$
49676 -** 49572 -**
49677 -****************************************************************************/ 49573 -****************************************************************************/
49678 - 49574 -
49679 -// Most of the code here was originally written by Serika Kurusugawa 49575 -// Most of the code here was originally written by Serika Kurusugawa
49741 -QT_END_NAMESPACE 49637 -QT_END_NAMESPACE
49742 - 49638 -
49743 -#endif // QEUCJPCODEC_H 49639 -#endif // QEUCJPCODEC_H
49744 diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp 49640 diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp
49745 deleted file mode 100644 49641 deleted file mode 100644
49746 index 85eae20..0000000 49642 index 2ac3d6c..0000000
49747 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp 49643 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp
49748 +++ /dev/null 49644 +++ /dev/null
49749 @@ -1,145 +0,0 @@ 49645 @@ -1,145 +0,0 @@
49750 -/**************************************************************************** 49646 -/****************************************************************************
49751 -** 49647 -**
49752 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49648 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49753 -** All rights reserved. 49649 -** Contact: http://www.qt-project.org/
49754 -** Contact: Nokia Corporation (qt-info@nokia.com)
49755 -** 49650 -**
49756 -** This file is part of the plugins of the Qt Toolkit. 49651 -** This file is part of the plugins of the Qt Toolkit.
49757 -** 49652 -**
49758 -** $QT_BEGIN_LICENSE:LGPL$ 49653 -** $QT_BEGIN_LICENSE:LGPL$
49759 -** GNU Lesser General Public License Usage 49654 -** GNU Lesser General Public License Usage
49782 -** 49677 -**
49783 -** 49678 -**
49784 -** 49679 -**
49785 -** 49680 -**
49786 -** 49681 -**
49682 -**
49787 -** $QT_END_LICENSE$ 49683 -** $QT_END_LICENSE$
49788 -** 49684 -**
49789 -****************************************************************************/ 49685 -****************************************************************************/
49790 - 49686 -
49791 -#include "qfontjpcodec.h" 49687 -#include "qfontjpcodec.h"
49892 -#endif 49788 -#endif
49893 - 49789 -
49894 -QT_END_NAMESPACE 49790 -QT_END_NAMESPACE
49895 diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h 49791 diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h
49896 deleted file mode 100644 49792 deleted file mode 100644
49897 index 6b2a6ee..0000000 49793 index dfb06bb..0000000
49898 --- a/src/plugins/codecs/jp/qfontjpcodec.h 49794 --- a/src/plugins/codecs/jp/qfontjpcodec.h
49899 +++ /dev/null 49795 +++ /dev/null
49900 @@ -1,93 +0,0 @@ 49796 @@ -1,93 +0,0 @@
49901 -/**************************************************************************** 49797 -/****************************************************************************
49902 -** 49798 -**
49903 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49799 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
49904 -** All rights reserved. 49800 -** Contact: http://www.qt-project.org/
49905 -** Contact: Nokia Corporation (qt-info@nokia.com)
49906 -** 49801 -**
49907 -** This file is part of the plugins of the Qt Toolkit. 49802 -** This file is part of the plugins of the Qt Toolkit.
49908 -** 49803 -**
49909 -** $QT_BEGIN_LICENSE:LGPL$ 49804 -** $QT_BEGIN_LICENSE:LGPL$
49910 -** GNU Lesser General Public License Usage 49805 -** GNU Lesser General Public License Usage
49933 -** 49828 -**
49934 -** 49829 -**
49935 -** 49830 -**
49936 -** 49831 -**
49937 -** 49832 -**
49833 -**
49938 -** $QT_END_LICENSE$ 49834 -** $QT_END_LICENSE$
49939 -** 49835 -**
49940 -****************************************************************************/ 49836 -****************************************************************************/
49941 - 49837 -
49942 -#ifndef QFONTJPCODEC_H 49838 -#ifndef QFONTJPCODEC_H
49991 -QT_END_NAMESPACE 49887 -QT_END_NAMESPACE
49992 - 49888 -
49993 -#endif // QFONTJPCODEC_H 49889 -#endif // QFONTJPCODEC_H
49994 diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp 49890 diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp
49995 deleted file mode 100644 49891 deleted file mode 100644
49996 index 99c756e..0000000 49892 index dd80541..0000000
49997 --- a/src/plugins/codecs/jp/qjiscodec.cpp 49893 --- a/src/plugins/codecs/jp/qjiscodec.cpp
49998 +++ /dev/null 49894 +++ /dev/null
49999 @@ -1,367 +0,0 @@ 49895 @@ -1,367 +0,0 @@
50000 -/**************************************************************************** 49896 -/****************************************************************************
50001 -** 49897 -**
50002 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 49898 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
50003 -** All rights reserved. 49899 -** Contact: http://www.qt-project.org/
50004 -** Contact: Nokia Corporation (qt-info@nokia.com)
50005 -** 49900 -**
50006 -** This file is part of the plugins of the Qt Toolkit. 49901 -** This file is part of the plugins of the Qt Toolkit.
50007 -** 49902 -**
50008 -** $QT_BEGIN_LICENSE:LGPL$ 49903 -** $QT_BEGIN_LICENSE:LGPL$
50009 -** GNU Lesser General Public License Usage 49904 -** GNU Lesser General Public License Usage
50027 -** http://www.gnu.org/copyleft/gpl.html. 49922 -** http://www.gnu.org/copyleft/gpl.html.
50028 -** 49923 -**
50029 -** Other Usage 49924 -** Other Usage
50030 -** Alternatively, this file may be used in accordance with the terms and 49925 -** Alternatively, this file may be used in accordance with the terms and
50031 -** conditions contained in a signed written agreement between you and Nokia. 49926 -** conditions contained in a signed written agreement between you and Nokia.
49927 -**
50032 -** 49928 -**
50033 -** 49929 -**
50034 -** 49930 -**
50035 -** 49931 -**
50036 -** 49932 -**
50364 -#endif // QT_NO_TEXTCODEC 50260 -#endif // QT_NO_TEXTCODEC
50365 - 50261 -
50366 -QT_END_NAMESPACE 50262 -QT_END_NAMESPACE
50367 diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h 50263 diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h
50368 deleted file mode 100644 50264 deleted file mode 100644
50369 index aaf02a9..0000000 50265 index dcdb04d..0000000
50370 --- a/src/plugins/codecs/jp/qjiscodec.h 50266 --- a/src/plugins/codecs/jp/qjiscodec.h
50371 +++ /dev/null 50267 +++ /dev/null
50372 @@ -1,106 +0,0 @@ 50268 @@ -1,106 +0,0 @@
50373 -/**************************************************************************** 50269 -/****************************************************************************
50374 -** 50270 -**
50375 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 50271 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
50376 -** All rights reserved. 50272 -** Contact: http://www.qt-project.org/
50377 -** Contact: Nokia Corporation (qt-info@nokia.com)
50378 -** 50273 -**
50379 -** This file is part of the plugins of the Qt Toolkit. 50274 -** This file is part of the plugins of the Qt Toolkit.
50380 -** 50275 -**
50381 -** $QT_BEGIN_LICENSE:LGPL$ 50276 -** $QT_BEGIN_LICENSE:LGPL$
50382 -** GNU Lesser General Public License Usage 50277 -** GNU Lesser General Public License Usage
50405 -** 50300 -**
50406 -** 50301 -**
50407 -** 50302 -**
50408 -** 50303 -**
50409 -** 50304 -**
50305 -**
50410 -** $QT_END_LICENSE$ 50306 -** $QT_END_LICENSE$
50411 -** 50307 -**
50412 -****************************************************************************/ 50308 -****************************************************************************/
50413 - 50309 -
50414 -// Most of the code here was originally written by Serika Kurusugawa 50310 -// Most of the code here was originally written by Serika Kurusugawa
50476 -QT_END_NAMESPACE 50372 -QT_END_NAMESPACE
50477 - 50373 -
50478 -#endif // QJISCODEC_H 50374 -#endif // QJISCODEC_H
50479 diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp 50375 diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp
50480 deleted file mode 100644 50376 deleted file mode 100644
50481 index feb0f41..0000000 50377 index ffd8829..0000000
50482 --- a/src/plugins/codecs/jp/qjpunicode.cpp 50378 --- a/src/plugins/codecs/jp/qjpunicode.cpp
50483 +++ /dev/null 50379 +++ /dev/null
50484 @@ -1,10700 +0,0 @@ 50380 @@ -1,10700 +0,0 @@
50485 -/**************************************************************************** 50381 -/****************************************************************************
50486 -** 50382 -**
50487 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 50383 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
50488 -** All rights reserved. 50384 -** Contact: http://www.qt-project.org/
50489 -** Contact: Nokia Corporation (qt-info@nokia.com)
50490 -** 50385 -**
50491 -** This file is part of the plugins of the Qt Toolkit. 50386 -** This file is part of the plugins of the Qt Toolkit.
50492 -** 50387 -**
50493 -** $QT_BEGIN_LICENSE:LGPL$ 50388 -** $QT_BEGIN_LICENSE:LGPL$
50494 -** GNU Lesser General Public License Usage 50389 -** GNU Lesser General Public License Usage
50512 -** http://www.gnu.org/copyleft/gpl.html. 50407 -** http://www.gnu.org/copyleft/gpl.html.
50513 -** 50408 -**
50514 -** Other Usage 50409 -** Other Usage
50515 -** Alternatively, this file may be used in accordance with the terms and 50410 -** Alternatively, this file may be used in accordance with the terms and
50516 -** conditions contained in a signed written agreement between you and Nokia. 50411 -** conditions contained in a signed written agreement between you and Nokia.
50412 -**
50517 -** 50413 -**
50518 -** 50414 -**
50519 -** 50415 -**
50520 -** 50416 -**
50521 -** 50417 -**
61182 -*/ 61078 -*/
61183 - 61079 -
61184 -QT_END_NAMESPACE 61080 -QT_END_NAMESPACE
61185 diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h 61081 diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h
61186 deleted file mode 100644 61082 deleted file mode 100644
61187 index 069f49a..0000000 61083 index a5bdd0c..0000000
61188 --- a/src/plugins/codecs/jp/qjpunicode.h 61084 --- a/src/plugins/codecs/jp/qjpunicode.h
61189 +++ /dev/null 61085 +++ /dev/null
61190 @@ -1,174 +0,0 @@ 61086 @@ -1,174 +0,0 @@
61191 -/**************************************************************************** 61087 -/****************************************************************************
61192 -** 61088 -**
61193 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 61089 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
61194 -** All rights reserved. 61090 -** Contact: http://www.qt-project.org/
61195 -** Contact: Nokia Corporation (qt-info@nokia.com)
61196 -** 61091 -**
61197 -** This file is part of the plugins of the Qt Toolkit. 61092 -** This file is part of the plugins of the Qt Toolkit.
61198 -** 61093 -**
61199 -** $QT_BEGIN_LICENSE:LGPL$ 61094 -** $QT_BEGIN_LICENSE:LGPL$
61200 -** GNU Lesser General Public License Usage 61095 -** GNU Lesser General Public License Usage
61223 -** 61118 -**
61224 -** 61119 -**
61225 -** 61120 -**
61226 -** 61121 -**
61227 -** 61122 -**
61123 -**
61228 -** $QT_END_LICENSE$ 61124 -** $QT_END_LICENSE$
61229 -** 61125 -**
61230 -****************************************************************************/ 61126 -****************************************************************************/
61231 - 61127 -
61232 -// Most of the code here was originally written by Serika Kurusugawa 61128 -// Most of the code here was originally written by Serika Kurusugawa
61362 -QT_END_NAMESPACE 61258 -QT_END_NAMESPACE
61363 - 61259 -
61364 -#endif // QJPUNICODE_H 61260 -#endif // QJPUNICODE_H
61365 diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp 61261 diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
61366 deleted file mode 100644 61262 deleted file mode 100644
61367 index ac89b33..0000000 61263 index f03cd26..0000000
61368 --- a/src/plugins/codecs/jp/qsjiscodec.cpp 61264 --- a/src/plugins/codecs/jp/qsjiscodec.cpp
61369 +++ /dev/null 61265 +++ /dev/null
61370 @@ -1,229 +0,0 @@ 61266 @@ -1,229 +0,0 @@
61371 -/**************************************************************************** 61267 -/****************************************************************************
61372 -** 61268 -**
61373 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 61269 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
61374 -** All rights reserved. 61270 -** Contact: http://www.qt-project.org/
61375 -** Contact: Nokia Corporation (qt-info@nokia.com)
61376 -** 61271 -**
61377 -** This file is part of the plugins of the Qt Toolkit. 61272 -** This file is part of the plugins of the Qt Toolkit.
61378 -** 61273 -**
61379 -** $QT_BEGIN_LICENSE:LGPL$ 61274 -** $QT_BEGIN_LICENSE:LGPL$
61380 -** GNU Lesser General Public License Usage 61275 -** GNU Lesser General Public License Usage
61398 -** http://www.gnu.org/copyleft/gpl.html. 61293 -** http://www.gnu.org/copyleft/gpl.html.
61399 -** 61294 -**
61400 -** Other Usage 61295 -** Other Usage
61401 -** Alternatively, this file may be used in accordance with the terms and 61296 -** Alternatively, this file may be used in accordance with the terms and
61402 -** conditions contained in a signed written agreement between you and Nokia. 61297 -** conditions contained in a signed written agreement between you and Nokia.
61298 -**
61403 -** 61299 -**
61404 -** 61300 -**
61405 -** 61301 -**
61406 -** 61302 -**
61407 -** 61303 -**
61597 -#endif // QT_NO_TEXTCODEC 61493 -#endif // QT_NO_TEXTCODEC
61598 - 61494 -
61599 -QT_END_NAMESPACE 61495 -QT_END_NAMESPACE
61600 diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h 61496 diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h
61601 deleted file mode 100644 61497 deleted file mode 100644
61602 index c56a103..0000000 61498 index 3d3cde7..0000000
61603 --- a/src/plugins/codecs/jp/qsjiscodec.h 61499 --- a/src/plugins/codecs/jp/qsjiscodec.h
61604 +++ /dev/null 61500 +++ /dev/null
61605 @@ -1,106 +0,0 @@ 61501 @@ -1,106 +0,0 @@
61606 -/**************************************************************************** 61502 -/****************************************************************************
61607 -** 61503 -**
61608 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 61504 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
61609 -** All rights reserved. 61505 -** Contact: http://www.qt-project.org/
61610 -** Contact: Nokia Corporation (qt-info@nokia.com)
61611 -** 61506 -**
61612 -** This file is part of the plugins of the Qt Toolkit. 61507 -** This file is part of the plugins of the Qt Toolkit.
61613 -** 61508 -**
61614 -** $QT_BEGIN_LICENSE:LGPL$ 61509 -** $QT_BEGIN_LICENSE:LGPL$
61615 -** GNU Lesser General Public License Usage 61510 -** GNU Lesser General Public License Usage
61638 -** 61533 -**
61639 -** 61534 -**
61640 -** 61535 -**
61641 -** 61536 -**
61642 -** 61537 -**
61538 -**
61643 -** $QT_END_LICENSE$ 61539 -** $QT_END_LICENSE$
61644 -** 61540 -**
61645 -****************************************************************************/ 61541 -****************************************************************************/
61646 - 61542 -
61647 -// Most of the code here was originally written by Serika Kurusugawa 61543 -// Most of the code here was originally written by Serika Kurusugawa
61709 -QT_END_NAMESPACE 61605 -QT_END_NAMESPACE
61710 - 61606 -
61711 -#endif // QSJISCODEC_H 61607 -#endif // QSJISCODEC_H
61712 diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h 61608 diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h
61713 deleted file mode 100644 61609 deleted file mode 100644
61714 index 25723c7..0000000 61610 index 8bf9204..0000000
61715 --- a/src/plugins/codecs/kr/cp949codetbl.h 61611 --- a/src/plugins/codecs/kr/cp949codetbl.h
61716 +++ /dev/null 61612 +++ /dev/null
61717 @@ -1,637 +0,0 @@ 61613 @@ -1,637 +0,0 @@
61718 -/**************************************************************************** 61614 -/****************************************************************************
61719 -** 61615 -**
61720 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 61616 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
61721 -** All rights reserved. 61617 -** Contact: http://www.qt-project.org/
61722 -** Contact: Nokia Corporation (qt-info@nokia.com)
61723 -** 61618 -**
61724 -** This file is part of the plugins of the Qt Toolkit. 61619 -** This file is part of the plugins of the Qt Toolkit.
61725 -** 61620 -**
61726 -** $QT_BEGIN_LICENSE:LGPL$ 61621 -** $QT_BEGIN_LICENSE:LGPL$
61727 -** GNU Lesser General Public License Usage 61622 -** GNU Lesser General Public License Usage
61745 -** http://www.gnu.org/copyleft/gpl.html. 61640 -** http://www.gnu.org/copyleft/gpl.html.
61746 -** 61641 -**
61747 -** Other Usage 61642 -** Other Usage
61748 -** Alternatively, this file may be used in accordance with the terms and 61643 -** Alternatively, this file may be used in accordance with the terms and
61749 -** conditions contained in a signed written agreement between you and Nokia. 61644 -** conditions contained in a signed written agreement between you and Nokia.
61645 -**
61750 -** 61646 -**
61751 -** 61647 -**
61752 -** 61648 -**
61753 -** 61649 -**
61754 -** 61650 -**
62378 -INSTALLS += target 62274 -INSTALLS += target
62379 - 62275 -
62380 -symbian:TARGET.UID3=0x2001B2E5 62276 -symbian:TARGET.UID3=0x2001B2E5
62381 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp 62277 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp
62382 deleted file mode 100644 62278 deleted file mode 100644
62383 index 86cb7c2..0000000 62279 index cbfd133..0000000
62384 --- a/src/plugins/codecs/kr/main.cpp 62280 --- a/src/plugins/codecs/kr/main.cpp
62385 +++ /dev/null 62281 +++ /dev/null
62386 @@ -1,131 +0,0 @@ 62282 @@ -1,131 +0,0 @@
62387 -/**************************************************************************** 62283 -/****************************************************************************
62388 -** 62284 -**
62389 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 62285 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
62390 -** All rights reserved. 62286 -** Contact: http://www.qt-project.org/
62391 -** Contact: Nokia Corporation (qt-info@nokia.com)
62392 -** 62287 -**
62393 -** This file is part of the plugins of the Qt Toolkit. 62288 -** This file is part of the plugins of the Qt Toolkit.
62394 -** 62289 -**
62395 -** $QT_BEGIN_LICENSE:LGPL$ 62290 -** $QT_BEGIN_LICENSE:LGPL$
62396 -** GNU Lesser General Public License Usage 62291 -** GNU Lesser General Public License Usage
62419 -** 62314 -**
62420 -** 62315 -**
62421 -** 62316 -**
62422 -** 62317 -**
62423 -** 62318 -**
62319 -**
62424 -** $QT_END_LICENSE$ 62320 -** $QT_END_LICENSE$
62425 -** 62321 -**
62426 -****************************************************************************/ 62322 -****************************************************************************/
62427 - 62323 -
62428 -#include <qtextcodecplugin.h> 62324 -#include <qtextcodecplugin.h>
62515 -#endif // QT_NO_TEXTCODECPLUGIN 62411 -#endif // QT_NO_TEXTCODECPLUGIN
62516 - 62412 -
62517 -QT_END_NAMESPACE 62413 -QT_END_NAMESPACE
62518 diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp 62414 diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp
62519 deleted file mode 100644 62415 deleted file mode 100644
62520 index cc8fca8..0000000 62416 index bef4132..0000000
62521 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp 62417 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp
62522 +++ /dev/null 62418 +++ /dev/null
62523 @@ -1,3571 +0,0 @@ 62419 @@ -1,3571 +0,0 @@
62524 -/**************************************************************************** 62420 -/****************************************************************************
62525 -** 62421 -**
62526 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 62422 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
62527 -** All rights reserved. 62423 -** Contact: http://www.qt-project.org/
62528 -** Contact: Nokia Corporation (qt-info@nokia.com)
62529 -** 62424 -**
62530 -** This file is part of the plugins of the Qt Toolkit. 62425 -** This file is part of the plugins of the Qt Toolkit.
62531 -** 62426 -**
62532 -** $QT_BEGIN_LICENSE:LGPL$ 62427 -** $QT_BEGIN_LICENSE:LGPL$
62533 -** GNU Lesser General Public License Usage 62428 -** GNU Lesser General Public License Usage
62551 -** http://www.gnu.org/copyleft/gpl.html. 62446 -** http://www.gnu.org/copyleft/gpl.html.
62552 -** 62447 -**
62553 -** Other Usage 62448 -** Other Usage
62554 -** Alternatively, this file may be used in accordance with the terms and 62449 -** Alternatively, this file may be used in accordance with the terms and
62555 -** conditions contained in a signed written agreement between you and Nokia. 62450 -** conditions contained in a signed written agreement between you and Nokia.
62451 -**
62556 -** 62452 -**
62557 -** 62453 -**
62558 -** 62454 -**
62559 -** 62455 -**
62560 -** 62456 -**
66092 -#endif // QT_NO_TEXTCODEC 65988 -#endif // QT_NO_TEXTCODEC
66093 - 65989 -
66094 -QT_END_NAMESPACE 65990 -QT_END_NAMESPACE
66095 diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h 65991 diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h
66096 deleted file mode 100644 65992 deleted file mode 100644
66097 index 9408622..0000000 65993 index 55a1337..0000000
66098 --- a/src/plugins/codecs/kr/qeuckrcodec.h 65994 --- a/src/plugins/codecs/kr/qeuckrcodec.h
66099 +++ /dev/null 65995 +++ /dev/null
66100 @@ -1,129 +0,0 @@ 65996 @@ -1,129 +0,0 @@
66101 -/**************************************************************************** 65997 -/****************************************************************************
66102 -** 65998 -**
66103 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 65999 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
66104 -** All rights reserved. 66000 -** Contact: http://www.qt-project.org/
66105 -** Contact: Nokia Corporation (qt-info@nokia.com)
66106 -** 66001 -**
66107 -** This file is part of the plugins of the Qt Toolkit. 66002 -** This file is part of the plugins of the Qt Toolkit.
66108 -** 66003 -**
66109 -** $QT_BEGIN_LICENSE:LGPL$ 66004 -** $QT_BEGIN_LICENSE:LGPL$
66110 -** GNU Lesser General Public License Usage 66005 -** GNU Lesser General Public License Usage
66133 -** 66028 -**
66134 -** 66029 -**
66135 -** 66030 -**
66136 -** 66031 -**
66137 -** 66032 -**
66033 -**
66138 -** $QT_END_LICENSE$ 66034 -** $QT_END_LICENSE$
66139 -** 66035 -**
66140 -****************************************************************************/ 66036 -****************************************************************************/
66141 - 66037 -
66142 -/* 66038 -/*
66227 -QT_END_NAMESPACE 66123 -QT_END_NAMESPACE
66228 - 66124 -
66229 -#endif // QEUCKRCODEC_H 66125 -#endif // QEUCKRCODEC_H
66230 diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp 66126 diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp
66231 deleted file mode 100644 66127 deleted file mode 100644
66232 index 9c993e3..0000000 66128 index 4536e67..0000000
66233 --- a/src/plugins/codecs/tw/main.cpp 66129 --- a/src/plugins/codecs/tw/main.cpp
66234 +++ /dev/null 66130 +++ /dev/null
66235 @@ -1,138 +0,0 @@ 66131 @@ -1,138 +0,0 @@
66236 -/**************************************************************************** 66132 -/****************************************************************************
66237 -** 66133 -**
66238 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 66134 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
66239 -** All rights reserved. 66135 -** Contact: http://www.qt-project.org/
66240 -** Contact: Nokia Corporation (qt-info@nokia.com)
66241 -** 66136 -**
66242 -** This file is part of the plugins of the Qt Toolkit. 66137 -** This file is part of the plugins of the Qt Toolkit.
66243 -** 66138 -**
66244 -** $QT_BEGIN_LICENSE:LGPL$ 66139 -** $QT_BEGIN_LICENSE:LGPL$
66245 -** GNU Lesser General Public License Usage 66140 -** GNU Lesser General Public License Usage
66268 -** 66163 -**
66269 -** 66164 -**
66270 -** 66165 -**
66271 -** 66166 -**
66272 -** 66167 -**
66168 -**
66273 -** $QT_END_LICENSE$ 66169 -** $QT_END_LICENSE$
66274 -** 66170 -**
66275 -****************************************************************************/ 66171 -****************************************************************************/
66276 - 66172 -
66277 -#include <qtextcodecplugin.h> 66173 -#include <qtextcodecplugin.h>
66371 -#endif // QT_NO_TEXTCODECPLUGIN 66267 -#endif // QT_NO_TEXTCODECPLUGIN
66372 - 66268 -
66373 -QT_END_NAMESPACE 66269 -QT_END_NAMESPACE
66374 diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp 66270 diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp
66375 deleted file mode 100644 66271 deleted file mode 100644
66376 index e30861d..0000000 66272 index 662aee8..0000000
66377 --- a/src/plugins/codecs/tw/qbig5codec.cpp 66273 --- a/src/plugins/codecs/tw/qbig5codec.cpp
66378 +++ /dev/null 66274 +++ /dev/null
66379 @@ -1,12788 +0,0 @@ 66275 @@ -1,12788 +0,0 @@
66380 -/**************************************************************************** 66276 -/****************************************************************************
66381 -** 66277 -**
66382 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 66278 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
66383 -** All rights reserved. 66279 -** Contact: http://www.qt-project.org/
66384 -** Contact: Nokia Corporation (qt-info@nokia.com)
66385 -** 66280 -**
66386 -** This file is part of the plugins of the Qt Toolkit. 66281 -** This file is part of the plugins of the Qt Toolkit.
66387 -** 66282 -**
66388 -** $QT_BEGIN_LICENSE:LGPL$ 66283 -** $QT_BEGIN_LICENSE:LGPL$
66389 -** GNU Lesser General Public License Usage 66284 -** GNU Lesser General Public License Usage
66407 -** http://www.gnu.org/copyleft/gpl.html. 66302 -** http://www.gnu.org/copyleft/gpl.html.
66408 -** 66303 -**
66409 -** Other Usage 66304 -** Other Usage
66410 -** Alternatively, this file may be used in accordance with the terms and 66305 -** Alternatively, this file may be used in accordance with the terms and
66411 -** conditions contained in a signed written agreement between you and Nokia. 66306 -** conditions contained in a signed written agreement between you and Nokia.
66307 -**
66412 -** 66308 -**
66413 -** 66309 -**
66414 -** 66310 -**
66415 -** 66311 -**
66416 -** 66312 -**
79165 -#endif // QT_NO_TEXTCODEC 79061 -#endif // QT_NO_TEXTCODEC
79166 - 79062 -
79167 -QT_END_NAMESPACE 79063 -QT_END_NAMESPACE
79168 diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h 79064 diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h
79169 deleted file mode 100644 79065 deleted file mode 100644
79170 index f43b733..0000000 79066 index eec1798..0000000
79171 --- a/src/plugins/codecs/tw/qbig5codec.h 79067 --- a/src/plugins/codecs/tw/qbig5codec.h
79172 +++ /dev/null 79068 +++ /dev/null
79173 @@ -1,124 +0,0 @@ 79069 @@ -1,124 +0,0 @@
79174 -/**************************************************************************** 79070 -/****************************************************************************
79175 -** 79071 -**
79176 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 79072 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79177 -** All rights reserved. 79073 -** Contact: http://www.qt-project.org/
79178 -** Contact: Nokia Corporation (qt-info@nokia.com)
79179 -** 79074 -**
79180 -** This file is part of the plugins of the Qt Toolkit. 79075 -** This file is part of the plugins of the Qt Toolkit.
79181 -** 79076 -**
79182 -** $QT_BEGIN_LICENSE:LGPL$ 79077 -** $QT_BEGIN_LICENSE:LGPL$
79183 -** GNU Lesser General Public License Usage 79078 -** GNU Lesser General Public License Usage
79206 -** 79101 -**
79207 -** 79102 -**
79208 -** 79103 -**
79209 -** 79104 -**
79210 -** 79105 -**
79106 -**
79211 -** $QT_END_LICENSE$ 79107 -** $QT_END_LICENSE$
79212 -** 79108 -**
79213 -****************************************************************************/ 79109 -****************************************************************************/
79214 - 79110 -
79215 -// Most of the code here was originally written by Ming-Che Chuang and 79111 -// Most of the code here was originally written by Ming-Che Chuang and
79332 -} 79228 -}
79333 !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines 79229 !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
79334 !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems 79230 !embedded:!qpa:!contains(QT_CONFIG, no-gui):SUBDIRS *= graphicssystems
79335 embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers 79231 embedded:SUBDIRS *= gfxdrivers decorations mousedrivers kbddrivers
79336 -- 79232 --
79337 1.7.9.2 79233 1.7.10.4
79338 79234
79339 79235
79340 From 71aff51d79b2b92edbf40d642903b5114548cc42 Mon Sep 17 00:00:00 2001 79236 From 7c457dbd99e5865f13499146e9487e9cb4b86868 Mon Sep 17 00:00:00 2001
79341 From: Mark Brand <mabrand@mabrand.nl> 79237 From: Mark Brand <mabrand@mabrand.nl>
79342 Date: Wed, 18 Jan 2012 21:01:26 +0100 79238 Date: Wed, 18 Jan 2012 21:01:26 +0100
79343 Subject: [PATCH 06/15] update private header references 79239 Subject: [PATCH 06/23] update private header references
79344 79240
79345 backported from qt5/qtbase 79241 backported from qt5/qtbase
79346 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6 79242 Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6
79347 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 79243 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
79348 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 79244 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
79349 (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa) 79245 (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa)
79350 ---
79351 src/corelib/codecs/qbig5codec.cpp | 2 +-
79352 src/corelib/codecs/qeucjpcodec.cpp | 2 +-
79353 src/corelib/codecs/qeucjpcodec_p.h | 2 +-
79354 src/corelib/codecs/qeuckrcodec.cpp | 4 ++--
79355 src/corelib/codecs/qfontjpcodec.cpp | 4 ++--
79356 src/corelib/codecs/qgb18030codec.cpp | 2 +-
79357 src/corelib/codecs/qjiscodec.cpp | 2 +-
79358 src/corelib/codecs/qjiscodec_p.h | 2 +-
79359 src/corelib/codecs/qjpunicode.cpp | 2 +-
79360 src/corelib/codecs/qsjiscodec.cpp | 2 +-
79361 src/corelib/codecs/qsjiscodec_p.h | 2 +-
79362 11 files changed, 13 insertions(+), 13 deletions(-)
79363 79246
79364 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 79247 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
79365 index e30861d..c1a73f7 100644 79248 index 662aee8..cd39ea0 100644
79366 --- a/src/corelib/codecs/qbig5codec.cpp 79249 --- a/src/corelib/codecs/qbig5codec.cpp
79367 +++ b/src/corelib/codecs/qbig5codec.cpp 79250 +++ b/src/corelib/codecs/qbig5codec.cpp
79368 @@ -39,7 +39,7 @@ 79251 @@ -39,7 +39,7 @@
79369 ** 79252 **
79370 ****************************************************************************/ 79253 ****************************************************************************/
79373 +#include "qbig5codec_p.h" 79256 +#include "qbig5codec_p.h"
79374 79257
79375 QT_BEGIN_NAMESPACE 79258 QT_BEGIN_NAMESPACE
79376 79259
79377 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 79260 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
79378 index 4ff5552..f5f4285 100644 79261 index 69e314c..091ad4d 100644
79379 --- a/src/corelib/codecs/qeucjpcodec.cpp 79262 --- a/src/corelib/codecs/qeucjpcodec.cpp
79380 +++ b/src/corelib/codecs/qeucjpcodec.cpp 79263 +++ b/src/corelib/codecs/qeucjpcodec.cpp
79381 @@ -73,7 +73,7 @@ 79264 @@ -73,7 +73,7 @@
79382 * SUCH DAMAGE. 79265 * SUCH DAMAGE.
79383 */ 79266 */
79386 +#include "qeucjpcodec_p.h" 79269 +#include "qeucjpcodec_p.h"
79387 79270
79388 QT_BEGIN_NAMESPACE 79271 QT_BEGIN_NAMESPACE
79389 79272
79390 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 79273 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
79391 index af02ed9..9cc7c3d 100644 79274 index d693e04..a5cd119 100644
79392 --- a/src/corelib/codecs/qeucjpcodec_p.h 79275 --- a/src/corelib/codecs/qeucjpcodec_p.h
79393 +++ b/src/corelib/codecs/qeucjpcodec_p.h 79276 +++ b/src/corelib/codecs/qeucjpcodec_p.h
79394 @@ -71,7 +71,7 @@ 79277 @@ -71,7 +71,7 @@
79395 #ifndef QEUCJPCODEC_H 79278 #ifndef QEUCJPCODEC_H
79396 #define QEUCJPCODEC_H 79279 #define QEUCJPCODEC_H
79399 +#include "qjpunicode_p.h" 79282 +#include "qjpunicode_p.h"
79400 #include <QtCore/qtextcodec.h> 79283 #include <QtCore/qtextcodec.h>
79401 #include <QtCore/qlist.h> 79284 #include <QtCore/qlist.h>
79402 79285
79403 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 79286 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
79404 index cc8fca8..00beebd 100644 79287 index bef4132..f91442f 100644
79405 --- a/src/corelib/codecs/qeuckrcodec.cpp 79288 --- a/src/corelib/codecs/qeuckrcodec.cpp
79406 +++ b/src/corelib/codecs/qeuckrcodec.cpp 79289 +++ b/src/corelib/codecs/qeuckrcodec.cpp
79407 @@ -65,8 +65,8 @@ 79290 @@ -65,8 +65,8 @@
79408 QString toUnicode(const char* chars, int len) const; 79291 QString toUnicode(const char* chars, int len) const;
79409 */ 79292 */
79414 +#include "cp949codetbl_p.h" 79297 +#include "cp949codetbl_p.h"
79415 79298
79416 QT_BEGIN_NAMESPACE 79299 QT_BEGIN_NAMESPACE
79417 79300
79418 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 79301 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
79419 index 85eae20..6763c88 100644 79302 index 2ac3d6c..590d72d 100644
79420 --- a/src/corelib/codecs/qfontjpcodec.cpp 79303 --- a/src/corelib/codecs/qfontjpcodec.cpp
79421 +++ b/src/corelib/codecs/qfontjpcodec.cpp 79304 +++ b/src/corelib/codecs/qfontjpcodec.cpp
79422 @@ -39,9 +39,9 @@ 79305 @@ -39,9 +39,9 @@
79423 ** 79306 **
79424 ****************************************************************************/ 79307 ****************************************************************************/
79430 +#include "qjpunicode_p.h" 79313 +#include "qjpunicode_p.h"
79431 79314
79432 QT_BEGIN_NAMESPACE 79315 QT_BEGIN_NAMESPACE
79433 79316
79434 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 79317 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
79435 index 760fcc0..d5a40df 100644 79318 index 928bc52..5c0e701 100644
79436 --- a/src/corelib/codecs/qgb18030codec.cpp 79319 --- a/src/corelib/codecs/qgb18030codec.cpp
79437 +++ b/src/corelib/codecs/qgb18030codec.cpp 79320 +++ b/src/corelib/codecs/qgb18030codec.cpp
79438 @@ -44,7 +44,7 @@ 79321 @@ -44,7 +44,7 @@
79439 \internal 79322 \internal
79440 */ 79323 */
79443 +#include "qgb18030codec_p.h" 79326 +#include "qgb18030codec_p.h"
79444 79327
79445 #ifndef QT_NO_TEXTCODEC 79328 #ifndef QT_NO_TEXTCODEC
79446 79329
79447 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 79330 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
79448 index 99c756e..b311646 100644 79331 index dd80541..1831170 100644
79449 --- a/src/corelib/codecs/qjiscodec.cpp 79332 --- a/src/corelib/codecs/qjiscodec.cpp
79450 +++ b/src/corelib/codecs/qjiscodec.cpp 79333 +++ b/src/corelib/codecs/qjiscodec.cpp
79451 @@ -48,7 +48,7 @@ 79334 @@ -48,7 +48,7 @@
79452 \internal 79335 \internal
79453 */ 79336 */
79456 +#include "qjiscodec_p.h" 79339 +#include "qjiscodec_p.h"
79457 #include "qlist.h" 79340 #include "qlist.h"
79458 79341
79459 QT_BEGIN_NAMESPACE 79342 QT_BEGIN_NAMESPACE
79460 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 79343 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
79461 index aaf02a9..3cd7c80 100644 79344 index dcdb04d..bb59c33 100644
79462 --- a/src/corelib/codecs/qjiscodec_p.h 79345 --- a/src/corelib/codecs/qjiscodec_p.h
79463 +++ b/src/corelib/codecs/qjiscodec_p.h 79346 +++ b/src/corelib/codecs/qjiscodec_p.h
79464 @@ -71,7 +71,7 @@ 79347 @@ -71,7 +71,7 @@
79465 #ifndef QJISCODEC_H 79348 #ifndef QJISCODEC_H
79466 #define QJISCODEC_H 79349 #define QJISCODEC_H
79469 +#include "qjpunicode_p.h" 79352 +#include "qjpunicode_p.h"
79470 #include <QtCore/qtextcodec.h> 79353 #include <QtCore/qtextcodec.h>
79471 #include <QtCore/qlist.h> 79354 #include <QtCore/qlist.h>
79472 79355
79473 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 79356 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
79474 index feb0f41..67d4630 100644 79357 index ffd8829..7827ef3 100644
79475 --- a/src/corelib/codecs/qjpunicode.cpp 79358 --- a/src/corelib/codecs/qjpunicode.cpp
79476 +++ b/src/corelib/codecs/qjpunicode.cpp 79359 +++ b/src/corelib/codecs/qjpunicode.cpp
79477 @@ -44,7 +44,7 @@ 79360 @@ -44,7 +44,7 @@
79478 \internal 79361 \internal
79479 */ 79362 */
79482 +#include "qjpunicode_p.h" 79365 +#include "qjpunicode_p.h"
79483 79366
79484 #include "qbytearray.h" 79367 #include "qbytearray.h"
79485 #include <stdlib.h> 79368 #include <stdlib.h>
79486 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 79369 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
79487 index ac89b33..b80b494 100644 79370 index f03cd26..97e6000 100644
79488 --- a/src/corelib/codecs/qsjiscodec.cpp 79371 --- a/src/corelib/codecs/qsjiscodec.cpp
79489 +++ b/src/corelib/codecs/qsjiscodec.cpp 79372 +++ b/src/corelib/codecs/qsjiscodec.cpp
79490 @@ -48,7 +48,7 @@ 79373 @@ -48,7 +48,7 @@
79491 \internal 79374 \internal
79492 */ 79375 */
79495 +#include "qsjiscodec_p.h" 79378 +#include "qsjiscodec_p.h"
79496 #include "qlist.h" 79379 #include "qlist.h"
79497 79380
79498 QT_BEGIN_NAMESPACE 79381 QT_BEGIN_NAMESPACE
79499 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 79382 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
79500 index c56a103..df1449b 100644 79383 index 3d3cde7..4910bfd 100644
79501 --- a/src/corelib/codecs/qsjiscodec_p.h 79384 --- a/src/corelib/codecs/qsjiscodec_p.h
79502 +++ b/src/corelib/codecs/qsjiscodec_p.h 79385 +++ b/src/corelib/codecs/qsjiscodec_p.h
79503 @@ -71,7 +71,7 @@ 79386 @@ -71,7 +71,7 @@
79504 #ifndef QSJISCODEC_H 79387 #ifndef QSJISCODEC_H
79505 #define QSJISCODEC_H 79388 #define QSJISCODEC_H
79508 +#include "qjpunicode_p.h" 79391 +#include "qjpunicode_p.h"
79509 #include <QtCore/qtextcodec.h> 79392 #include <QtCore/qtextcodec.h>
79510 #include <QtCore/qlist.h> 79393 #include <QtCore/qlist.h>
79511 79394
79512 -- 79395 --
79513 1.7.9.2 79396 1.7.10.4
79514 79397
79515 79398
79516 From 4cc7d919207633377a3afc52f750d551bc7a90bd Mon Sep 17 00:00:00 2001 79399 From 2be2accfee23fee3a9d97e5852ff9d2a01a7c33f Mon Sep 17 00:00:00 2001
79517 From: Mark Brand <mabrand@mabrand.nl> 79400 From: Mark Brand <mabrand@mabrand.nl>
79518 Date: Sun, 3 Jul 2011 21:53:27 +0200 79401 Date: Sun, 3 Jul 2011 21:53:27 +0200
79519 Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs 79402 Subject: [PATCH 07/23] cosmetic adjustments for files moved to core/codecs
79520 79403
79521 -update old reference to 'plugin' 79404 -update old reference to 'plugin'
79522 -rename multiple inclusion guards 79405 -rename multiple inclusion guards
79523 -add private header warning text 79406 -add private header warning text
79524 79407
79525 backported from qt5/qtbase 79408 backported from qt5/qtbase
79526 Change-Id: I4c582dcba549d871bd8d929bee5372586117eabb 79409 Change-Id: I4c582dcba549d871bd8d929bee5372586117eabb
79527 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 79410 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
79528 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 79411 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
79529 (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967) 79412 (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967)
79530 ---
79531 src/corelib/codecs/cp949codetbl_p.h | 19 +++++++++++++++----
79532 src/corelib/codecs/qbig5codec.cpp | 2 +-
79533 src/corelib/codecs/qbig5codec_p.h | 19 +++++++++++++++----
79534 src/corelib/codecs/qeucjpcodec.cpp | 2 +-
79535 src/corelib/codecs/qeucjpcodec_p.h | 19 +++++++++++++++----
79536 src/corelib/codecs/qeuckrcodec.cpp | 2 +-
79537 src/corelib/codecs/qeuckrcodec_p.h | 19 +++++++++++++++----
79538 src/corelib/codecs/qfontjpcodec.cpp | 2 +-
79539 src/corelib/codecs/qfontjpcodec_p.h | 19 +++++++++++++++----
79540 src/corelib/codecs/qgb18030codec.cpp | 2 +-
79541 src/corelib/codecs/qgb18030codec_p.h | 19 +++++++++++++++----
79542 src/corelib/codecs/qjiscodec.cpp | 2 +-
79543 src/corelib/codecs/qjiscodec_p.h | 19 +++++++++++++++----
79544 src/corelib/codecs/qjpunicode.cpp | 2 +-
79545 src/corelib/codecs/qjpunicode_p.h | 19 +++++++++++++++----
79546 src/corelib/codecs/qsjiscodec.cpp | 2 +-
79547 src/corelib/codecs/qsjiscodec_p.h | 19 +++++++++++++++----
79548 17 files changed, 143 insertions(+), 44 deletions(-)
79549 79413
79550 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h 79414 diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h
79551 index 25723c7..0e608fa 100644 79415 index 8bf9204..228c5ad 100644
79552 --- a/src/corelib/codecs/cp949codetbl_p.h 79416 --- a/src/corelib/codecs/cp949codetbl_p.h
79553 +++ b/src/corelib/codecs/cp949codetbl_p.h 79417 +++ b/src/corelib/codecs/cp949codetbl_p.h
79554 @@ -4,7 +4,7 @@ 79418 @@ -3,7 +3,7 @@
79555 ** All rights reserved. 79419 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79556 ** Contact: Nokia Corporation (qt-info@nokia.com) 79420 ** Contact: http://www.qt-project.org/
79557 ** 79421 **
79558 -** This file is part of the plugins of the Qt Toolkit. 79422 -** This file is part of the plugins of the Qt Toolkit.
79559 +** This file is part of the QtCore module of the Qt Toolkit. 79423 +** This file is part of the QtCore module of the Qt Toolkit.
79560 ** 79424 **
79561 ** $QT_BEGIN_LICENSE:LGPL$ 79425 ** $QT_BEGIN_LICENSE:LGPL$
79587 }; 79451 };
79588 79452
79589 -#endif // CP494CODETBL_H 79453 -#endif // CP494CODETBL_H
79590 +#endif // CP494CODETBL_P_H 79454 +#endif // CP494CODETBL_P_H
79591 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp 79455 diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp
79592 index c1a73f7..ecdc84d 100644 79456 index cd39ea0..13b317f 100644
79593 --- a/src/corelib/codecs/qbig5codec.cpp 79457 --- a/src/corelib/codecs/qbig5codec.cpp
79594 +++ b/src/corelib/codecs/qbig5codec.cpp 79458 +++ b/src/corelib/codecs/qbig5codec.cpp
79595 @@ -4,7 +4,7 @@ 79459 @@ -3,7 +3,7 @@
79596 ** All rights reserved. 79460 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79597 ** Contact: Nokia Corporation (qt-info@nokia.com) 79461 ** Contact: http://www.qt-project.org/
79598 ** 79462 **
79599 -** This file is part of the plugins of the Qt Toolkit. 79463 -** This file is part of the plugins of the Qt Toolkit.
79600 +** This file is part of the QtCore module of the Qt Toolkit. 79464 +** This file is part of the QtCore module of the Qt Toolkit.
79601 ** 79465 **
79602 ** $QT_BEGIN_LICENSE:LGPL$ 79466 ** $QT_BEGIN_LICENSE:LGPL$
79603 ** GNU Lesser General Public License Usage 79467 ** GNU Lesser General Public License Usage
79604 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h 79468 diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h
79605 index f43b733..849ff9d 100644 79469 index eec1798..674c513 100644
79606 --- a/src/corelib/codecs/qbig5codec_p.h 79470 --- a/src/corelib/codecs/qbig5codec_p.h
79607 +++ b/src/corelib/codecs/qbig5codec_p.h 79471 +++ b/src/corelib/codecs/qbig5codec_p.h
79608 @@ -4,7 +4,7 @@ 79472 @@ -3,7 +3,7 @@
79609 ** All rights reserved. 79473 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79610 ** Contact: Nokia Corporation (qt-info@nokia.com) 79474 ** Contact: http://www.qt-project.org/
79611 ** 79475 **
79612 -** This file is part of the plugins of the Qt Toolkit. 79476 -** This file is part of the plugins of the Qt Toolkit.
79613 +** This file is part of the QtCore module of the Qt Toolkit. 79477 +** This file is part of the QtCore module of the Qt Toolkit.
79614 ** 79478 **
79615 ** $QT_BEGIN_LICENSE:LGPL$ 79479 ** $QT_BEGIN_LICENSE:LGPL$
79641 QT_END_NAMESPACE 79505 QT_END_NAMESPACE
79642 79506
79643 -#endif // QBIG5CODEC_H 79507 -#endif // QBIG5CODEC_H
79644 +#endif // QBIG5CODEC_P_H 79508 +#endif // QBIG5CODEC_P_H
79645 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp 79509 diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp
79646 index f5f4285..c681492 100644 79510 index 091ad4d..773c473 100644
79647 --- a/src/corelib/codecs/qeucjpcodec.cpp 79511 --- a/src/corelib/codecs/qeucjpcodec.cpp
79648 +++ b/src/corelib/codecs/qeucjpcodec.cpp 79512 +++ b/src/corelib/codecs/qeucjpcodec.cpp
79649 @@ -4,7 +4,7 @@ 79513 @@ -3,7 +3,7 @@
79650 ** All rights reserved. 79514 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79651 ** Contact: Nokia Corporation (qt-info@nokia.com) 79515 ** Contact: http://www.qt-project.org/
79652 ** 79516 **
79653 -** This file is part of the plugins of the Qt Toolkit. 79517 -** This file is part of the plugins of the Qt Toolkit.
79654 +** This file is part of the QtCore module of the Qt Toolkit. 79518 +** This file is part of the QtCore module of the Qt Toolkit.
79655 ** 79519 **
79656 ** $QT_BEGIN_LICENSE:LGPL$ 79520 ** $QT_BEGIN_LICENSE:LGPL$
79657 ** GNU Lesser General Public License Usage 79521 ** GNU Lesser General Public License Usage
79658 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h 79522 diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h
79659 index 9cc7c3d..d34ac7c 100644 79523 index a5cd119..97d8523 100644
79660 --- a/src/corelib/codecs/qeucjpcodec_p.h 79524 --- a/src/corelib/codecs/qeucjpcodec_p.h
79661 +++ b/src/corelib/codecs/qeucjpcodec_p.h 79525 +++ b/src/corelib/codecs/qeucjpcodec_p.h
79662 @@ -4,7 +4,7 @@ 79526 @@ -3,7 +3,7 @@
79663 ** All rights reserved. 79527 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79664 ** Contact: Nokia Corporation (qt-info@nokia.com) 79528 ** Contact: http://www.qt-project.org/
79665 ** 79529 **
79666 -** This file is part of the plugins of the Qt Toolkit. 79530 -** This file is part of the plugins of the Qt Toolkit.
79667 +** This file is part of the QtCore module of the Qt Toolkit. 79531 +** This file is part of the QtCore module of the Qt Toolkit.
79668 ** 79532 **
79669 ** $QT_BEGIN_LICENSE:LGPL$ 79533 ** $QT_BEGIN_LICENSE:LGPL$
79695 QT_END_NAMESPACE 79559 QT_END_NAMESPACE
79696 79560
79697 -#endif // QEUCJPCODEC_H 79561 -#endif // QEUCJPCODEC_H
79698 +#endif // QEUCJPCODEC_P_H 79562 +#endif // QEUCJPCODEC_P_H
79699 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp 79563 diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
79700 index 00beebd..2cd472b 100644 79564 index f91442f..8417bf0 100644
79701 --- a/src/corelib/codecs/qeuckrcodec.cpp 79565 --- a/src/corelib/codecs/qeuckrcodec.cpp
79702 +++ b/src/corelib/codecs/qeuckrcodec.cpp 79566 +++ b/src/corelib/codecs/qeuckrcodec.cpp
79703 @@ -4,7 +4,7 @@ 79567 @@ -3,7 +3,7 @@
79704 ** All rights reserved. 79568 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79705 ** Contact: Nokia Corporation (qt-info@nokia.com) 79569 ** Contact: http://www.qt-project.org/
79706 ** 79570 **
79707 -** This file is part of the plugins of the Qt Toolkit. 79571 -** This file is part of the plugins of the Qt Toolkit.
79708 +** This file is part of the QtCore module of the Qt Toolkit. 79572 +** This file is part of the QtCore module of the Qt Toolkit.
79709 ** 79573 **
79710 ** $QT_BEGIN_LICENSE:LGPL$ 79574 ** $QT_BEGIN_LICENSE:LGPL$
79711 ** GNU Lesser General Public License Usage 79575 ** GNU Lesser General Public License Usage
79712 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h 79576 diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h
79713 index 9408622..f498d7c 100644 79577 index 55a1337..79647b1 100644
79714 --- a/src/corelib/codecs/qeuckrcodec_p.h 79578 --- a/src/corelib/codecs/qeuckrcodec_p.h
79715 +++ b/src/corelib/codecs/qeuckrcodec_p.h 79579 +++ b/src/corelib/codecs/qeuckrcodec_p.h
79716 @@ -4,7 +4,7 @@ 79580 @@ -3,7 +3,7 @@
79717 ** All rights reserved. 79581 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79718 ** Contact: Nokia Corporation (qt-info@nokia.com) 79582 ** Contact: http://www.qt-project.org/
79719 ** 79583 **
79720 -** This file is part of the plugins of the Qt Toolkit. 79584 -** This file is part of the plugins of the Qt Toolkit.
79721 +** This file is part of the QtCore module of the Qt Toolkit. 79585 +** This file is part of the QtCore module of the Qt Toolkit.
79722 ** 79586 **
79723 ** $QT_BEGIN_LICENSE:LGPL$ 79587 ** $QT_BEGIN_LICENSE:LGPL$
79749 QT_END_NAMESPACE 79613 QT_END_NAMESPACE
79750 79614
79751 -#endif // QEUCKRCODEC_H 79615 -#endif // QEUCKRCODEC_H
79752 +#endif // QEUCKRCODEC_P_H 79616 +#endif // QEUCKRCODEC_P_H
79753 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp 79617 diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp
79754 index 6763c88..156ec3a 100644 79618 index 590d72d..3d39524 100644
79755 --- a/src/corelib/codecs/qfontjpcodec.cpp 79619 --- a/src/corelib/codecs/qfontjpcodec.cpp
79756 +++ b/src/corelib/codecs/qfontjpcodec.cpp 79620 +++ b/src/corelib/codecs/qfontjpcodec.cpp
79757 @@ -4,7 +4,7 @@ 79621 @@ -3,7 +3,7 @@
79758 ** All rights reserved. 79622 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79759 ** Contact: Nokia Corporation (qt-info@nokia.com) 79623 ** Contact: http://www.qt-project.org/
79760 ** 79624 **
79761 -** This file is part of the plugins of the Qt Toolkit. 79625 -** This file is part of the plugins of the Qt Toolkit.
79762 +** This file is part of the QtCore module of the Qt Toolkit. 79626 +** This file is part of the QtCore module of the Qt Toolkit.
79763 ** 79627 **
79764 ** $QT_BEGIN_LICENSE:LGPL$ 79628 ** $QT_BEGIN_LICENSE:LGPL$
79765 ** GNU Lesser General Public License Usage 79629 ** GNU Lesser General Public License Usage
79766 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h 79630 diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h
79767 index 6b2a6ee..981a086 100644 79631 index dfb06bb..9e9b8dd 100644
79768 --- a/src/corelib/codecs/qfontjpcodec_p.h 79632 --- a/src/corelib/codecs/qfontjpcodec_p.h
79769 +++ b/src/corelib/codecs/qfontjpcodec_p.h 79633 +++ b/src/corelib/codecs/qfontjpcodec_p.h
79770 @@ -4,7 +4,7 @@ 79634 @@ -3,7 +3,7 @@
79771 ** All rights reserved. 79635 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79772 ** Contact: Nokia Corporation (qt-info@nokia.com) 79636 ** Contact: http://www.qt-project.org/
79773 ** 79637 **
79774 -** This file is part of the plugins of the Qt Toolkit. 79638 -** This file is part of the plugins of the Qt Toolkit.
79775 +** This file is part of the QtCore module of the Qt Toolkit. 79639 +** This file is part of the QtCore module of the Qt Toolkit.
79776 ** 79640 **
79777 ** $QT_BEGIN_LICENSE:LGPL$ 79641 ** $QT_BEGIN_LICENSE:LGPL$
79803 QT_END_NAMESPACE 79667 QT_END_NAMESPACE
79804 79668
79805 -#endif // QFONTJPCODEC_H 79669 -#endif // QFONTJPCODEC_H
79806 +#endif // QFONTJPCODEC_P_H 79670 +#endif // QFONTJPCODEC_P_H
79807 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp 79671 diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp
79808 index d5a40df..2b56018 100644 79672 index 5c0e701..c5daef6 100644
79809 --- a/src/corelib/codecs/qgb18030codec.cpp 79673 --- a/src/corelib/codecs/qgb18030codec.cpp
79810 +++ b/src/corelib/codecs/qgb18030codec.cpp 79674 +++ b/src/corelib/codecs/qgb18030codec.cpp
79811 @@ -4,7 +4,7 @@ 79675 @@ -3,7 +3,7 @@
79812 ** All rights reserved. 79676 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79813 ** Contact: Nokia Corporation (qt-info@nokia.com) 79677 ** Contact: http://www.qt-project.org/
79814 ** 79678 **
79815 -** This file is part of the plugins of the Qt Toolkit. 79679 -** This file is part of the plugins of the Qt Toolkit.
79816 +** This file is part of the QtCore module of the Qt Toolkit. 79680 +** This file is part of the QtCore module of the Qt Toolkit.
79817 ** 79681 **
79818 ** $QT_BEGIN_LICENSE:LGPL$ 79682 ** $QT_BEGIN_LICENSE:LGPL$
79819 ** GNU Lesser General Public License Usage 79683 ** GNU Lesser General Public License Usage
79820 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h 79684 diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h
79821 index 85047f3..6c3cb31 100644 79685 index 3e082bf..0f66211 100644
79822 --- a/src/corelib/codecs/qgb18030codec_p.h 79686 --- a/src/corelib/codecs/qgb18030codec_p.h
79823 +++ b/src/corelib/codecs/qgb18030codec_p.h 79687 +++ b/src/corelib/codecs/qgb18030codec_p.h
79824 @@ -4,7 +4,7 @@ 79688 @@ -3,7 +3,7 @@
79825 ** All rights reserved. 79689 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79826 ** Contact: Nokia Corporation (qt-info@nokia.com) 79690 ** Contact: http://www.qt-project.org/
79827 ** 79691 **
79828 -** This file is part of the plugins of the Qt Toolkit. 79692 -** This file is part of the plugins of the Qt Toolkit.
79829 +** This file is part of the QtCore module of the Qt Toolkit. 79693 +** This file is part of the QtCore module of the Qt Toolkit.
79830 ** 79694 **
79831 ** $QT_BEGIN_LICENSE:LGPL$ 79695 ** $QT_BEGIN_LICENSE:LGPL$
79857 QT_END_NAMESPACE 79721 QT_END_NAMESPACE
79858 79722
79859 -#endif // QGB18030CODEC_H 79723 -#endif // QGB18030CODEC_H
79860 +#endif // QGB18030CODEC_P_H 79724 +#endif // QGB18030CODEC_P_H
79861 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp 79725 diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp
79862 index b311646..7b5fb4e 100644 79726 index 1831170..83c4329 100644
79863 --- a/src/corelib/codecs/qjiscodec.cpp 79727 --- a/src/corelib/codecs/qjiscodec.cpp
79864 +++ b/src/corelib/codecs/qjiscodec.cpp 79728 +++ b/src/corelib/codecs/qjiscodec.cpp
79865 @@ -4,7 +4,7 @@ 79729 @@ -3,7 +3,7 @@
79866 ** All rights reserved. 79730 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79867 ** Contact: Nokia Corporation (qt-info@nokia.com) 79731 ** Contact: http://www.qt-project.org/
79868 ** 79732 **
79869 -** This file is part of the plugins of the Qt Toolkit. 79733 -** This file is part of the plugins of the Qt Toolkit.
79870 +** This file is part of the QtCore module of the Qt Toolkit. 79734 +** This file is part of the QtCore module of the Qt Toolkit.
79871 ** 79735 **
79872 ** $QT_BEGIN_LICENSE:LGPL$ 79736 ** $QT_BEGIN_LICENSE:LGPL$
79873 ** GNU Lesser General Public License Usage 79737 ** GNU Lesser General Public License Usage
79874 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h 79738 diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h
79875 index 3cd7c80..4a0fc43 100644 79739 index bb59c33..daccf57 100644
79876 --- a/src/corelib/codecs/qjiscodec_p.h 79740 --- a/src/corelib/codecs/qjiscodec_p.h
79877 +++ b/src/corelib/codecs/qjiscodec_p.h 79741 +++ b/src/corelib/codecs/qjiscodec_p.h
79878 @@ -4,7 +4,7 @@ 79742 @@ -3,7 +3,7 @@
79879 ** All rights reserved. 79743 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79880 ** Contact: Nokia Corporation (qt-info@nokia.com) 79744 ** Contact: http://www.qt-project.org/
79881 ** 79745 **
79882 -** This file is part of the plugins of the Qt Toolkit. 79746 -** This file is part of the plugins of the Qt Toolkit.
79883 +** This file is part of the QtCore module of the Qt Toolkit. 79747 +** This file is part of the QtCore module of the Qt Toolkit.
79884 ** 79748 **
79885 ** $QT_BEGIN_LICENSE:LGPL$ 79749 ** $QT_BEGIN_LICENSE:LGPL$
79911 QT_END_NAMESPACE 79775 QT_END_NAMESPACE
79912 79776
79913 -#endif // QJISCODEC_H 79777 -#endif // QJISCODEC_H
79914 +#endif // QJISCODEC_P_H 79778 +#endif // QJISCODEC_P_H
79915 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp 79779 diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp
79916 index 67d4630..03db950 100644 79780 index 7827ef3..1e4883f 100644
79917 --- a/src/corelib/codecs/qjpunicode.cpp 79781 --- a/src/corelib/codecs/qjpunicode.cpp
79918 +++ b/src/corelib/codecs/qjpunicode.cpp 79782 +++ b/src/corelib/codecs/qjpunicode.cpp
79919 @@ -4,7 +4,7 @@ 79783 @@ -3,7 +3,7 @@
79920 ** All rights reserved. 79784 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79921 ** Contact: Nokia Corporation (qt-info@nokia.com) 79785 ** Contact: http://www.qt-project.org/
79922 ** 79786 **
79923 -** This file is part of the plugins of the Qt Toolkit. 79787 -** This file is part of the plugins of the Qt Toolkit.
79924 +** This file is part of the QtCore module of the Qt Toolkit. 79788 +** This file is part of the QtCore module of the Qt Toolkit.
79925 ** 79789 **
79926 ** $QT_BEGIN_LICENSE:LGPL$ 79790 ** $QT_BEGIN_LICENSE:LGPL$
79927 ** GNU Lesser General Public License Usage 79791 ** GNU Lesser General Public License Usage
79928 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h 79792 diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h
79929 index 069f49a..82b3d2c 100644 79793 index a5bdd0c..07b5b25 100644
79930 --- a/src/corelib/codecs/qjpunicode_p.h 79794 --- a/src/corelib/codecs/qjpunicode_p.h
79931 +++ b/src/corelib/codecs/qjpunicode_p.h 79795 +++ b/src/corelib/codecs/qjpunicode_p.h
79932 @@ -4,7 +4,7 @@ 79796 @@ -3,7 +3,7 @@
79933 ** All rights reserved. 79797 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79934 ** Contact: Nokia Corporation (qt-info@nokia.com) 79798 ** Contact: http://www.qt-project.org/
79935 ** 79799 **
79936 -** This file is part of the plugins of the Qt Toolkit. 79800 -** This file is part of the plugins of the Qt Toolkit.
79937 +** This file is part of the QtCore module of the Qt Toolkit. 79801 +** This file is part of the QtCore module of the Qt Toolkit.
79938 ** 79802 **
79939 ** $QT_BEGIN_LICENSE:LGPL$ 79803 ** $QT_BEGIN_LICENSE:LGPL$
79965 QT_END_NAMESPACE 79829 QT_END_NAMESPACE
79966 79830
79967 -#endif // QJPUNICODE_H 79831 -#endif // QJPUNICODE_H
79968 +#endif // QJPUNICODE_P_H 79832 +#endif // QJPUNICODE_P_H
79969 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp 79833 diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp
79970 index b80b494..c4438e3 100644 79834 index 97e6000..27121ad 100644
79971 --- a/src/corelib/codecs/qsjiscodec.cpp 79835 --- a/src/corelib/codecs/qsjiscodec.cpp
79972 +++ b/src/corelib/codecs/qsjiscodec.cpp 79836 +++ b/src/corelib/codecs/qsjiscodec.cpp
79973 @@ -4,7 +4,7 @@ 79837 @@ -3,7 +3,7 @@
79974 ** All rights reserved. 79838 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79975 ** Contact: Nokia Corporation (qt-info@nokia.com) 79839 ** Contact: http://www.qt-project.org/
79976 ** 79840 **
79977 -** This file is part of the plugins of the Qt Toolkit. 79841 -** This file is part of the plugins of the Qt Toolkit.
79978 +** This file is part of the QtCore module of the Qt Toolkit. 79842 +** This file is part of the QtCore module of the Qt Toolkit.
79979 ** 79843 **
79980 ** $QT_BEGIN_LICENSE:LGPL$ 79844 ** $QT_BEGIN_LICENSE:LGPL$
79981 ** GNU Lesser General Public License Usage 79845 ** GNU Lesser General Public License Usage
79982 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h 79846 diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h
79983 index df1449b..f8efcae 100644 79847 index 4910bfd..d57f94b 100644
79984 --- a/src/corelib/codecs/qsjiscodec_p.h 79848 --- a/src/corelib/codecs/qsjiscodec_p.h
79985 +++ b/src/corelib/codecs/qsjiscodec_p.h 79849 +++ b/src/corelib/codecs/qsjiscodec_p.h
79986 @@ -4,7 +4,7 @@ 79850 @@ -3,7 +3,7 @@
79987 ** All rights reserved. 79851 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
79988 ** Contact: Nokia Corporation (qt-info@nokia.com) 79852 ** Contact: http://www.qt-project.org/
79989 ** 79853 **
79990 -** This file is part of the plugins of the Qt Toolkit. 79854 -** This file is part of the plugins of the Qt Toolkit.
79991 +** This file is part of the QtCore module of the Qt Toolkit. 79855 +** This file is part of the QtCore module of the Qt Toolkit.
79992 ** 79856 **
79993 ** $QT_BEGIN_LICENSE:LGPL$ 79857 ** $QT_BEGIN_LICENSE:LGPL$
80019 QT_END_NAMESPACE 79883 QT_END_NAMESPACE
80020 79884
80021 -#endif // QSJISCODEC_H 79885 -#endif // QSJISCODEC_H
80022 +#endif // QSJISCODEC_P_H 79886 +#endif // QSJISCODEC_P_H
80023 -- 79887 --
80024 1.7.9.2 79888 1.7.10.4
80025 79889
80026 79890
80027 From e57ad0b10f420f62db94ba3ed3367d34ad2825ca Mon Sep 17 00:00:00 2001 79891 From eeecdea8f15353aa0461ec09f7064f456849a3c3 Mon Sep 17 00:00:00 2001
80028 From: Mark Brand <mabrand@mabrand.nl> 79892 From: Mark Brand <mabrand@mabrand.nl>
80029 Date: Thu, 12 Jan 2012 10:43:29 +0100 79893 Date: Thu, 12 Jan 2012 10:43:29 +0100
80030 Subject: [PATCH 08/15] remove obsolete codec plugin loading code 79894 Subject: [PATCH 08/23] remove obsolete codec plugin loading code
80031 79895
80032 backported from qt5/qtbase 79896 backported from qt5/qtbase
80033 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d 79897 Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d
80034 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 79898 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
80035 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> 79899 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
80036 (cherry picked from commit 3a3356a85079d734dfa57205a00e1996afc033df) 79900 (cherry picked from commit 3a3356a85079d734dfa57205a00e1996afc033df)
80037 79901
80038 Conflicts: 79902 Conflicts:
80039 79903
80040 dist/changes-5.0.0 79904 dist/changes-5.0.0
80041 ---
80042 src/corelib/codecs/codecs.pri | 8 +-
80043 src/corelib/codecs/qtextcodec.cpp | 87 +----------------
80044 src/corelib/codecs/qtextcodecplugin.cpp | 161 -------------------------------
80045 src/corelib/codecs/qtextcodecplugin.h | 96 ------------------
80046 src/corelib/global/qconfig-medium.h | 3 -
80047 src/corelib/global/qconfig-minimal.h | 3 -
80048 src/corelib/global/qconfig-nacl.h | 3 -
80049 src/corelib/global/qconfig-small.h | 3 -
80050 src/corelib/global/qfeatures.h | 5 -
80051 9 files changed, 4 insertions(+), 365 deletions(-)
80052 delete mode 100644 src/corelib/codecs/qtextcodecplugin.cpp
80053 delete mode 100644 src/corelib/codecs/qtextcodecplugin.h
80054 79905
80055 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri 79906 diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri
80056 index a1271b9..9274eda 100644 79907 index a1271b9..9274eda 100644
80057 --- a/src/corelib/codecs/codecs.pri 79908 --- a/src/corelib/codecs/codecs.pri
80058 +++ b/src/corelib/codecs/codecs.pri 79909 +++ b/src/corelib/codecs/codecs.pri
80081 - codecs/qtextcodecplugin.cpp \ 79932 - codecs/qtextcodecplugin.cpp \
80082 codecs/qgb18030codec.cpp \ 79933 codecs/qgb18030codec.cpp \
80083 codecs/qjpunicode.cpp \ 79934 codecs/qjpunicode.cpp \
80084 codecs/qeucjpcodec.cpp \ 79935 codecs/qeucjpcodec.cpp \
80085 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp 79936 diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
80086 index 3a2a60e..3cd5a5e 100644 79937 index b6ed5e6..55e5b83 100644
80087 --- a/src/corelib/codecs/qtextcodec.cpp 79938 --- a/src/corelib/codecs/qtextcodec.cpp
80088 +++ b/src/corelib/codecs/qtextcodec.cpp 79939 +++ b/src/corelib/codecs/qtextcodec.cpp
80089 @@ -48,11 +48,6 @@ 79940 @@ -48,11 +48,6 @@
80090 #include "qlist.h" 79941 #include "qlist.h"
80091 #include "qfile.h" 79942 #include "qfile.h"
80229 return codecs; 80080 return codecs;
80230 } 80081 }
80231 80082
80232 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp 80083 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp
80233 deleted file mode 100644 80084 deleted file mode 100644
80234 index 4eb075c..0000000 80085 index b164f31..0000000
80235 --- a/src/corelib/codecs/qtextcodecplugin.cpp 80086 --- a/src/corelib/codecs/qtextcodecplugin.cpp
80236 +++ /dev/null 80087 +++ /dev/null
80237 @@ -1,161 +0,0 @@ 80088 @@ -1,161 +0,0 @@
80238 -/**************************************************************************** 80089 -/****************************************************************************
80239 -** 80090 -**
80240 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 80091 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
80241 -** All rights reserved. 80092 -** Contact: http://www.qt-project.org/
80242 -** Contact: Nokia Corporation (qt-info@nokia.com)
80243 -** 80093 -**
80244 -** This file is part of the QtCore module of the Qt Toolkit. 80094 -** This file is part of the QtCore module of the Qt Toolkit.
80245 -** 80095 -**
80246 -** $QT_BEGIN_LICENSE:LGPL$ 80096 -** $QT_BEGIN_LICENSE:LGPL$
80247 -** GNU Lesser General Public License Usage 80097 -** GNU Lesser General Public License Usage
80270 -** 80120 -**
80271 -** 80121 -**
80272 -** 80122 -**
80273 -** 80123 -**
80274 -** 80124 -**
80125 -**
80275 -** $QT_END_LICENSE$ 80126 -** $QT_END_LICENSE$
80276 -** 80127 -**
80277 -****************************************************************************/ 80128 -****************************************************************************/
80278 - 80129 -
80279 -#include "qtextcodecplugin.h" 80130 -#include "qtextcodecplugin.h"
80396 -QT_END_NAMESPACE 80247 -QT_END_NAMESPACE
80397 - 80248 -
80398 -#endif // QT_NO_TEXTCODECPLUGIN 80249 -#endif // QT_NO_TEXTCODECPLUGIN
80399 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h 80250 diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h
80400 deleted file mode 100644 80251 deleted file mode 100644
80401 index 9a00bbc..0000000 80252 index 2873b0e..0000000
80402 --- a/src/corelib/codecs/qtextcodecplugin.h 80253 --- a/src/corelib/codecs/qtextcodecplugin.h
80403 +++ /dev/null 80254 +++ /dev/null
80404 @@ -1,96 +0,0 @@ 80255 @@ -1,96 +0,0 @@
80405 -/**************************************************************************** 80256 -/****************************************************************************
80406 -** 80257 -**
80407 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). 80258 -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
80408 -** All rights reserved. 80259 -** Contact: http://www.qt-project.org/
80409 -** Contact: Nokia Corporation (qt-info@nokia.com)
80410 -** 80260 -**
80411 -** This file is part of the QtCore module of the Qt Toolkit. 80261 -** This file is part of the QtCore module of the Qt Toolkit.
80412 -** 80262 -**
80413 -** $QT_BEGIN_LICENSE:LGPL$ 80263 -** $QT_BEGIN_LICENSE:LGPL$
80414 -** GNU Lesser General Public License Usage 80264 -** GNU Lesser General Public License Usage
80437 -** 80287 -**
80438 -** 80288 -**
80439 -** 80289 -**
80440 -** 80290 -**
80441 -** 80291 -**
80292 -**
80442 -** $QT_END_LICENSE$ 80293 -** $QT_END_LICENSE$
80443 -** 80294 -**
80444 -****************************************************************************/ 80295 -****************************************************************************/
80445 - 80296 -
80446 -#ifndef QTEXTCODECPLUGIN_H 80297 -#ifndef QTEXTCODECPLUGIN_H
80497 - 80348 -
80498 -QT_END_HEADER 80349 -QT_END_HEADER
80499 - 80350 -
80500 -#endif // QTEXTCODECPLUGIN_H 80351 -#endif // QTEXTCODECPLUGIN_H
80501 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h 80352 diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h
80502 index 96207d1..779d4ef 100644 80353 index 170b2c3..9ed73aa 100644
80503 --- a/src/corelib/global/qconfig-medium.h 80354 --- a/src/corelib/global/qconfig-medium.h
80504 +++ b/src/corelib/global/qconfig-medium.h 80355 +++ b/src/corelib/global/qconfig-medium.h
80505 @@ -91,9 +91,6 @@ 80356 @@ -91,9 +91,6 @@
80506 #ifndef QT_NO_CODECS 80357 #ifndef QT_NO_CODECS
80507 # define QT_NO_CODECS 80358 # define QT_NO_CODECS
80511 -#endif 80362 -#endif
80512 #ifndef QT_NO_TRANSLATION 80363 #ifndef QT_NO_TRANSLATION
80513 # define QT_NO_TRANSLATION 80364 # define QT_NO_TRANSLATION
80514 #endif 80365 #endif
80515 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h 80366 diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h
80516 index da2bf14..dc963a7 100644 80367 index 6781c60..707e6b1 100644
80517 --- a/src/corelib/global/qconfig-minimal.h 80368 --- a/src/corelib/global/qconfig-minimal.h
80518 +++ b/src/corelib/global/qconfig-minimal.h 80369 +++ b/src/corelib/global/qconfig-minimal.h
80519 @@ -167,9 +167,6 @@ 80370 @@ -167,9 +167,6 @@
80520 #ifndef QT_NO_CODECS 80371 #ifndef QT_NO_CODECS
80521 # define QT_NO_CODECS 80372 # define QT_NO_CODECS
80525 -#endif 80376 -#endif
80526 #ifndef QT_NO_TRANSLATION 80377 #ifndef QT_NO_TRANSLATION
80527 # define QT_NO_TRANSLATION 80378 # define QT_NO_TRANSLATION
80528 #endif 80379 #endif
80529 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h 80380 diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h
80530 index d97e666..ecaad4f 100644 80381 index eb4632f..7fecfec 100644
80531 --- a/src/corelib/global/qconfig-nacl.h 80382 --- a/src/corelib/global/qconfig-nacl.h
80532 +++ b/src/corelib/global/qconfig-nacl.h 80383 +++ b/src/corelib/global/qconfig-nacl.h
80533 @@ -128,9 +128,6 @@ 80384 @@ -128,9 +128,6 @@
80534 #ifndef QT_NO_CODECS 80385 #ifndef QT_NO_CODECS
80535 # define QT_NO_CODECS 80386 # define QT_NO_CODECS
80539 -#endif 80390 -#endif
80540 #ifndef QT_NO_TRANSLATION 80391 #ifndef QT_NO_TRANSLATION
80541 # define QT_NO_TRANSLATION 80392 # define QT_NO_TRANSLATION
80542 #endif 80393 #endif
80543 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h 80394 diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h
80544 index fefbfb6..d0a7029 100644 80395 index 988dc6f..dda6567 100644
80545 --- a/src/corelib/global/qconfig-small.h 80396 --- a/src/corelib/global/qconfig-small.h
80546 +++ b/src/corelib/global/qconfig-small.h 80397 +++ b/src/corelib/global/qconfig-small.h
80547 @@ -128,9 +128,6 @@ 80398 @@ -128,9 +128,6 @@
80548 #ifndef QT_NO_CODECS 80399 #ifndef QT_NO_CODECS
80549 # define QT_NO_CODECS 80400 # define QT_NO_CODECS
80553 -#endif 80404 -#endif
80554 #ifndef QT_NO_TRANSLATION 80405 #ifndef QT_NO_TRANSLATION
80555 # define QT_NO_TRANSLATION 80406 # define QT_NO_TRANSLATION
80556 #endif 80407 #endif
80557 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h 80408 diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
80558 index 844101a..4ea4227 100644 80409 index 9612778..493269d 100644
80559 --- a/src/corelib/global/qfeatures.h 80410 --- a/src/corelib/global/qfeatures.h
80560 +++ b/src/corelib/global/qfeatures.h 80411 +++ b/src/corelib/global/qfeatures.h
80561 @@ -643,11 +643,6 @@ 80412 @@ -643,11 +643,6 @@
80562 #define QT_NO_TABDIALOG 80413 #define QT_NO_TABDIALOG
80563 #endif 80414 #endif
80569 - 80420 -
80570 // QColorDialog 80421 // QColorDialog
80571 #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX)) 80422 #if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_SPINBOX))
80572 #define QT_NO_COLORDIALOG 80423 #define QT_NO_COLORDIALOG
80573 -- 80424 --
80574 1.7.9.2 80425 1.7.10.4
80575 80426
80576 80427
80577 From ea246a109c1ebc2cfaad6e92ac87c4a1cc18ec7e Mon Sep 17 00:00:00 2001 80428 From c94d9111ef83683ea2b7db6e4070594c4a332f1c Mon Sep 17 00:00:00 2001
80578 From: Mark Brand <mabrand@mabrand.nl> 80429 From: Mark Brand <mabrand@mabrand.nl>
80579 Date: Mon, 23 Jan 2012 23:12:46 +0100 80430 Date: Mon, 23 Jan 2012 23:12:46 +0100
80580 Subject: [PATCH 09/15] remove vestiges of text codec plugins 80431 Subject: [PATCH 09/23] remove vestiges of text codec plugins
80581 80432
80582 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df 80433 follow-up to 3a3356a85079d734dfa57205a00e1996afc033df
80583 80434
80584 backported from qt5/qtbase 80435 backported from qt5/qtbase
80585 Change-Id: Iba84958cbcd105ec702568752090719cc108e101 80436 Change-Id: Iba84958cbcd105ec702568752090719cc108e101
80586 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 80437 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
80587 (cherry picked from commit 38d4618eb5f9b7293513267f9f5749aa2568e08c) 80438 (cherry picked from commit 38d4618eb5f9b7293513267f9f5749aa2568e08c)
80588 ---
80589 src/corelib/global/qfeatures.txt | 7 -------
80590 1 file changed, 7 deletions(-)
80591 80439
80592 diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt 80440 diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
80593 index dea05e0..12cd8ea 100644 80441 index dea05e0..12cd8ea 100644
80594 --- a/src/corelib/global/qfeatures.txt 80442 --- a/src/corelib/global/qfeatures.txt
80595 +++ b/src/corelib/global/qfeatures.txt 80443 +++ b/src/corelib/global/qfeatures.txt
80606 - 80454 -
80607 Feature: TRANSLATION 80455 Feature: TRANSLATION
80608 Description: Supports translations using QObject::tr(). 80456 Description: Supports translations using QObject::tr().
80609 Section: Internationalization 80457 Section: Internationalization
80610 -- 80458 --
80611 1.7.9.2 80459 1.7.10.4
80612 80460
80613 80461
80614 From 6fa42258f48a5e03ad9faa708202a1c53e1e5e20 Mon Sep 17 00:00:00 2001 80462 From 415466a4ac2a87522569544a9b9ba7115fc4acf7 Mon Sep 17 00:00:00 2001
80615 From: Mark Brand <mabrand@mabrand.nl> 80463 From: Mark Brand <mabrand@mabrand.nl>
80616 Date: Thu, 3 Nov 2011 15:10:26 +0100 80464 Date: Thu, 3 Nov 2011 15:10:26 +0100
80617 Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific) 80465 Subject: [PATCH 10/23] use pkg-config for libmng (MXE specific)
80618 80466
80619 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4 80467 Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4
80620 ---
80621 src/gui/image/qmnghandler.pri | 4 +++-
80622 1 file changed, 3 insertions(+), 1 deletion(-)
80623 80468
80624 diff --git a/src/gui/image/qmnghandler.pri b/src/gui/image/qmnghandler.pri 80469 diff --git a/src/gui/image/qmnghandler.pri b/src/gui/image/qmnghandler.pri
80625 index ffb98de..6aab68f 100644 80470 index ffb98de..6aab68f 100644
80626 --- a/src/gui/image/qmnghandler.pri 80471 --- a/src/gui/image/qmnghandler.pri
80627 +++ b/src/gui/image/qmnghandler.pri 80472 +++ b/src/gui/image/qmnghandler.pri
80635 + if(unix|win32-g++*):LIBS *= -lmng 80480 + if(unix|win32-g++*):LIBS *= -lmng
80636 else:win32: LIBS += libmng.lib 80481 else:win32: LIBS += libmng.lib
80637 } else { 80482 } else {
80638 include($$PWD/../../3rdparty/libmng.pri) 80483 include($$PWD/../../3rdparty/libmng.pri)
80639 -- 80484 --
80640 1.7.9.2 80485 1.7.10.4
80641 80486
80642 80487
80643 From 94cbc5be38cb1386ec6acd6045615abb9b370874 Mon Sep 17 00:00:00 2001 80488 From 1cac3150930d5353455b560792f7e76fe180ad26 Mon Sep 17 00:00:00 2001
80644 From: Mark Brand <mabrand@mabrand.nl> 80489 From: Mark Brand <mabrand@mabrand.nl>
80645 Date: Thu, 3 Nov 2011 14:11:02 +0100 80490 Date: Thu, 3 Nov 2011 14:11:02 +0100
80646 Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific) 80491 Subject: [PATCH 11/23] use pkg-config for libtiff-4 (MXE specific)
80647 80492
80648 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957 80493 Change-Id: I5e89e66fc1606d425553e781c9e62db703136957
80649 ---
80650 src/gui/image/qtiffhandler.pri | 4 +++-
80651 1 file changed, 3 insertions(+), 1 deletion(-)
80652 80494
80653 diff --git a/src/gui/image/qtiffhandler.pri b/src/gui/image/qtiffhandler.pri 80495 diff --git a/src/gui/image/qtiffhandler.pri b/src/gui/image/qtiffhandler.pri
80654 index e1cc3ee..71cbab1 100644 80496 index e1cc3ee..71cbab1 100644
80655 --- a/src/gui/image/qtiffhandler.pri 80497 --- a/src/gui/image/qtiffhandler.pri
80656 +++ b/src/gui/image/qtiffhandler.pri 80498 +++ b/src/gui/image/qtiffhandler.pri
80664 + if(unix|win32-g++*):LIBS *= -ltiff 80506 + if(unix|win32-g++*):LIBS *= -ltiff
80665 else:win32: LIBS += libtiff.lib 80507 else:win32: LIBS += libtiff.lib
80666 } else { 80508 } else {
80667 include($$PWD/../../3rdparty/libtiff.pri) 80509 include($$PWD/../../3rdparty/libtiff.pri)
80668 -- 80510 --
80669 1.7.9.2 80511 1.7.10.4
80670 80512
80671 80513
80672 From 2faf7d28bd1aa3b8b889ad68268700403ccba4d0 Mon Sep 17 00:00:00 2001 80514 From 28ad5f9d9c70feba6475652c6445bbe263998d3d Mon Sep 17 00:00:00 2001
80673 From: Mark Brand <mabrand@mabrand.nl> 80515 From: Mark Brand <mabrand@mabrand.nl>
80674 Date: Sat, 5 Jun 2010 23:41:04 +0200 80516 Date: Sat, 5 Jun 2010 23:41:04 +0200
80675 Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE 80517 Subject: [PATCH 12/23] restore support for static linking of QtWebKit (MXE
80676 specific) 80518 specific)
80677 80519
80678 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. 80520 Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113.
80679 80521
80680 For static Qt on win32-g++*, applications using webkit link to jscore and webcore. 80522 For static Qt on win32-g++*, applications using webkit link to jscore and webcore.
80682 Added INSTALLS and pkg-config for static jscore and webcore. 80524 Added INSTALLS and pkg-config for static jscore and webcore.
80683 80525
80684 Don't build Qt WebKit tests to avoid static linking problems. 80526 Don't build Qt WebKit tests to avoid static linking problems.
80685 80527
80686 Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da 80528 Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da
80687 ---
80688 configure | 6 ------
80689 .../Source/JavaScriptCore/JavaScriptCore.pri | 12 ++++++++++++
80690 src/3rdparty/webkit/Source/WebCore/WebCore.pri | 12 ++++++++++++
80691 src/3rdparty/webkit/Source/WebCore/WebCore.pro | 2 +-
80692 src/3rdparty/webkit/Source/WebKit.pro | 2 +-
80693 5 files changed, 26 insertions(+), 8 deletions(-)
80694 80529
80695 diff --git a/configure b/configure 80530 diff --git a/configure b/configure
80696 index 862aad5..f679fa4 100755 80531 index 520ffc3..e018443 100755
80697 --- a/configure 80532 --- a/configure
80698 +++ b/configure 80533 +++ b/configure
80699 @@ -7626,12 +7626,6 @@ if [ "$CFG_GUI" = "no" ]; then 80534 @@ -7683,12 +7683,6 @@ if [ "$CFG_GUI" = "no" ]; then
80700 canBuildWebKit="no" 80535 canBuildWebKit="no"
80701 fi 80536 fi
80702 80537
80703 -if [ "$CFG_SHARED" = "no" ]; then 80538 -if [ "$CFG_SHARED" = "no" ]; then
80704 - echo 80539 - echo
80774 +#exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests 80609 +#exists($$PWD/WebKit/qt/tests): SUBDIRS += WebKit/qt/tests
80775 80610
80776 build-qtscript { 80611 build-qtscript {
80777 SUBDIRS += \ 80612 SUBDIRS += \
80778 -- 80613 --
80779 1.7.9.2 80614 1.7.10.4
80780 80615
80781 80616
80782 From e2187b030e2d7bd0fc9f51190737d5d45d693197 Mon Sep 17 00:00:00 2001 80617 From ab04bc59d7caf5d04bb87bd75d2bbe98da89d599 Mon Sep 17 00:00:00 2001
80783 From: Tony Theodore <tonyt@logyst.com> 80618 From: Tony Theodore <tonyt@logyst.com>
80784 Date: Thu, 1 Sep 2011 13:47:10 +0200 80619 Date: Thu, 1 Sep 2011 13:47:10 +0200
80785 Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific) 80620 Subject: [PATCH 13/23] fix building on GNU/kFreeBSD (MXE specific)
80786 80621
80787 This patch has been taken from: 80622 This patch has been taken from:
80788 80623
80789 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 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
80790 80625
80791 Change-Id: I34d1ab97134b08246567e833d13a7c1924f535ed 80626 Change-Id: I34d1ab97134b08246567e833d13a7c1924f535ed
80792 Author: Pino Toscano <pino@kde.org> 80627 Author: Pino Toscano <pino@kde.org>
80793 Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL. 80628 Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL.
80794 Last-Update: 2010-10-06 80629 Last-Update: 2010-10-06
80795 ---
80796 src/corelib/global/qglobal.h | 2 ++
80797 1 file changed, 2 insertions(+)
80798 80630
80799 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h 80631 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
80800 index 15b6afb..55f7df3 100644 80632 index b3d4852..1a6a4a4 100644
80801 --- a/src/corelib/global/qglobal.h 80633 --- a/src/corelib/global/qglobal.h
80802 +++ b/src/corelib/global/qglobal.h 80634 +++ b/src/corelib/global/qglobal.h
80803 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {} 80635 @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {}
80804 #elif defined(__FreeBSD__) || defined(__DragonFly__) 80636 #elif defined(__FreeBSD__) || defined(__DragonFly__)
80805 # define Q_OS_FREEBSD 80637 # define Q_OS_FREEBSD
80808 +# define Q_OS_FREEBSD_KERNEL 80640 +# define Q_OS_FREEBSD_KERNEL
80809 #elif defined(__NetBSD__) 80641 #elif defined(__NetBSD__)
80810 # define Q_OS_NETBSD 80642 # define Q_OS_NETBSD
80811 # define Q_OS_BSD4 80643 # define Q_OS_BSD4
80812 -- 80644 --
80813 1.7.9.2 80645 1.7.10.4
80814 80646
80815 80647
80816 From edc8e5747312fb0dbc61ae4a1c432440cb70ad94 Mon Sep 17 00:00:00 2001 80648 From 28bf082efa51789d404e33bfbfdbe17a8261af87 Mon Sep 17 00:00:00 2001
80817 From: Tony Theodore <tonyt@logyst.com> 80649 From: Tony Theodore <tonyt@logyst.com>
80818 Date: Thu, 1 Sep 2011 13:49:47 +0200 80650 Date: Thu, 1 Sep 2011 13:49:47 +0200
80819 Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD 80651 Subject: [PATCH 14/23] fix missing platform when building on GNU/kFreeBSD
80820 (MXE specific) 80652 (MXE specific)
80821 80653
80822 This patch is inspired by: 80654 This patch is inspired by:
80823 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD 80655 http://anonscm.debian.org/gitweb/?p=pkg-kde/qt/qt4-x11.git;a=blob;f=debian/rules;h=47e5efbf09f77e6da51a3d719d2f6be47f69d096;hb=HEAD
80824 80656
80825 For the time being, glibc-g++ is simply a copy of linux-g++. 80657 For the time being, glibc-g++ is simply a copy of linux-g++.
80826 80658
80827 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95 80659 Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95
80828 ---
80829 configure | 3 +++
80830 1 file changed, 3 insertions(+)
80831 80660
80832 diff --git a/configure b/configure 80661 diff --git a/configure b/configure
80833 index f679fa4..bb563fe 100755 80662 index e018443..b600744 100755
80834 --- a/configure 80663 --- a/configure
80835 +++ b/configure 80664 +++ b/configure
80836 @@ -2809,6 +2809,9 @@ if [ -z "$PLATFORM" ]; then 80665 @@ -2845,6 +2845,9 @@ if [ -z "$PLATFORM" ]; then
80837 GNU:*) 80666 GNU:*)
80838 PLATFORM=hurd-g++ 80667 PLATFORM=hurd-g++
80839 ;; 80668 ;;
80840 + GNU/kFreeBSD:*) 80669 + GNU/kFreeBSD:*)
80841 + PLATFORM=linux-g++ 80670 + PLATFORM=linux-g++
80842 + ;; 80671 + ;;
80843 dgux:*) 80672 dgux:*)
80844 PLATFORM=dgux-g++ 80673 PLATFORM=dgux-g++
80845 ;; 80674 ;;
80846 -- 80675 --
80847 1.7.9.2 80676 1.7.10.4
80848 80677
80849 80678
80850 From 9e5f8124bdb183e115d742d45acb00fd7a8250c3 Mon Sep 17 00:00:00 2001 80679 From f32c0852485615d6938d1cde1e0b4dc4e6262a7e Mon Sep 17 00:00:00 2001
80851 From: Tony Theodore <tonyt@logyst.com> 80680 From: Tony Theodore <tonyt@logyst.com>
80852 Date: Thu, 1 Sep 2011 13:51:50 +0200 80681 Date: Thu, 1 Sep 2011 13:51:50 +0200
80853 Subject: [PATCH 15/15] fix building on dragonfly (MXE specific) 80682 Subject: [PATCH 15/23] fix building on dragonfly (MXE specific)
80854 80683
80855 This patch is inspired by: 80684 This patch is inspired by:
80856 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup 80685 http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup
80857 80686
80858 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d 80687 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d
80859 ---
80860 configure | 2 +-
80861 1 file changed, 1 insertion(+), 1 deletion(-)
80862 80688
80863 diff --git a/configure b/configure 80689 diff --git a/configure b/configure
80864 index bb563fe..79ca8d3 100755 80690 index b600744..599203d 100755
80865 --- a/configure 80691 --- a/configure
80866 +++ b/configure 80692 +++ b/configure
80867 @@ -2821,7 +2821,7 @@ if [ -z "$PLATFORM" ]; then 80693 @@ -2857,7 +2857,7 @@ if [ -z "$PLATFORM" ]; then
80868 ULTRIX:*) 80694 ULTRIX:*)
80869 PLATFORM=ultrix-g++ 80695 PLATFORM=ultrix-g++
80870 ;; 80696 ;;
80871 - FreeBSD:*) 80697 - FreeBSD:*)
80872 + FreeBSD:*|DragonFly:*) 80698 + FreeBSD:*|DragonFly:*)
80873 PLATFORM=freebsd-g++ 80699 PLATFORM=freebsd-g++
80874 PLATFORM_NOTES=" 80700 PLATFORM_NOTES="
80875 - Also available for FreeBSD: freebsd-icc 80701 - Also available for FreeBSD: freebsd-icc
80876 -- 80702 --
80877 1.7.9.2 80703 1.7.10.4
80878 80704
80705
80706 From 67da309cbc542e765d2254bd2e2c64a78c7cd35f Mon Sep 17 00:00:00 2001
80707 From: Yuchen Deng <loaden@gmail.com>
80708 Date: Sun, 19 Aug 2012 15:38:44 +0800
80709 Subject: [PATCH 16/23] Add -pipe option of win32-g++'s QMAKE_CFLAGS
80710
80711 cherry-picked from qt5/qtbase commit 2b57a8ebfeb6e3495b63fac619631896ca670f11
80712
80713 Change-Id: Idccab648df1a9456a4ee19f1acfdb0544d40a928
80714 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
80715 (cherry picked from commit 9fbdb93d3aa1cad8859325814e28f014acd18f10)
80716
80717 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
80718 index d174634..6d631fc 100644
80719 --- a/mkspecs/win32-g++/qmake.conf
80720 +++ b/mkspecs/win32-g++/qmake.conf
80721 @@ -25,7 +25,7 @@ QMAKE_LEX = flex
80722 QMAKE_LEXFLAGS =
80723 QMAKE_YACC = byacc
80724 QMAKE_YACCFLAGS = -d
80725 -QMAKE_CFLAGS =
80726 +QMAKE_CFLAGS = -pipe
80727 QMAKE_CFLAGS_DEPS = -M
80728 QMAKE_CFLAGS_WARN_ON = -Wall -Wextra
80729 QMAKE_CFLAGS_WARN_OFF = -w
80730 --
80731 1.7.10.4
80732
80733
80734 From eeeadca6963f3dedd6ea3626409199f49afa839f Mon Sep 17 00:00:00 2001
80735 From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
80736 Date: Mon, 10 Sep 2012 12:08:51 +0200
80737 Subject: [PATCH 17/23] find qdevice.pri even for installed qt builds
80738
80739 Change-Id: Ife18068974227d70c52e7cb0d06e6136827ac562
80740 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
80741 (cherry picked from commit ffac77f7de433f67570ff0da9656bce6481be920)
80742
80743 diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf
80744 index f7aeb07..7da3fe5 100644
80745 --- a/mkspecs/features/device_config.prf
80746 +++ b/mkspecs/features/device_config.prf
80747 @@ -1,6 +1,6 @@
80748 # Load generated qdevice.pri
80749 isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)
80750 -isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = . # where to get?
80751 +isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA]
80752
80753 DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri
80754
80755 --
80756 1.7.10.4
80757
80758
80759 From 2519a7dd92f14031c7d11775caa0645384febd87 Mon Sep 17 00:00:00 2001
80760 From: Mark Brand <mabrand@mabrand.nl>
80761 Date: Wed, 12 Sep 2012 00:22:28 +0200
80762 Subject: [PATCH 18/23] Partial Revert "Disable pkg-config, when x-compiling
80763 for mingw"
80764 MIME-Version: 1.0
80765 Content-Type: text/plain; charset=UTF-8
80766 Content-Transfer-Encoding: 8bit
80767
80768 This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271.
80769
80770 Despite what the commit message said, pkg-config previously worked
80771 and was useful, particularly for static Qt. Qt itself even installs
80772 its own .pc files.
80773
80774 Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid
80775 using the pkg-config installation on the build machine.
80776
80777 cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e
80778 Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7
80779 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
80780 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
80781 (cherry picked from commit 57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8)
80782
80783 diff --git a/configure b/configure
80784 index 599203d..a0786da 100755
80785 --- a/configure
80786 +++ b/configure
80787 @@ -1684,7 +1684,6 @@ while [ "$#" -gt 0 ]; do
80788 case `basename "$XPLATFORM"` in win32-g++*)
80789 XPLATFORM_MINGW=yes
80790 CFG_RPATH=no
80791 - PKG_CONFIG=no
80792 CFG_REDUCE_EXPORTS=no
80793 ;;
80794 esac
80795 --
80796 1.7.10.4
80797
80798
80799 From 03f7a56af4020aaead73c9d0de389d32fd4ddb24 Mon Sep 17 00:00:00 2001
80800 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
80801 Date: Wed, 12 Sep 2012 11:13:44 +0200
80802 Subject: [PATCH 19/23] When x-compiling on Linux the host tools doesn't have
80803 Windows' executable suffix
80804
80805 patch not needed for Qt5
80806
80807 Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1
80808 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
80809 (cherry picked from commit 95c55b8a913fd7aaa23a44f1f9aa568342b25e07)
80810
80811 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
80812 index 6d631fc..2cd2214 100644
80813 --- a/mkspecs/win32-g++/qmake.conf
80814 +++ b/mkspecs/win32-g++/qmake.conf
80815 @@ -11,6 +11,8 @@ MAKEFILE_GENERATOR = MINGW
80816
80817 load(device_config)
80818
80819 +equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe
80820 +
80821 TEMPLATE = app
80822 CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
80823 QT += core gui
80824 @@ -101,9 +103,9 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
80825 QMAKE_CHK_DIR_EXISTS = if not exist
80826 }
80827
80828 -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
80829 -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
80830 -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
80831 +QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc$${EXE_SUFFIX}
80832 +QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic$${EXE_SUFFIX}
80833 +QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc$${EXE_SUFFIX}
80834
80835 QMAKE_IDL = midl
80836 QMAKE_LIB = $${CROSS_COMPILE}ar -ru
80837 --
80838 1.7.10.4
80839
80840
80841 From 32415e3cb482c55b16d5953e37865ded1885869d Mon Sep 17 00:00:00 2001
80842 From: Mark Brand <mabrand@mabrand.nl>
80843 Date: Tue, 11 Sep 2012 23:45:02 +0200
80844 Subject: [PATCH 20/23] smuggle QT_BUILD_TREE to device_config.prf even during
80845 tests
80846
80847 Otherwise CROSS_COMPILE is not available for config.tests
80848 because qdevice.pri is not found in such configurations as:
80849
80850 ./configure -xplatform win32-g++-4.6 \
80851 -device-option CROSS_COMPILE=$TARGET \
80852 -prefix=$PREFIX/$TARGET \
80853 -prefix-install
80854
80855 Normally, we don't want to use .qmake.cache during tests,
80856 but we need that mechanism here.
80857
80858 Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1
80859 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
80860 (cherry picked from commit a0c6987dbb139829f9ea61a66cb863b1baa1f183)
80861
80862 diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
80863 index f4a7f29..b8f6743 100755
80864 --- a/config.tests/unix/compile.test
80865 +++ b/config.tests/unix/compile.test
80866 @@ -68,7 +68,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
80867 # Make sure output from possible previous tests is gone
80868 rm -f "$EXE" "${EXE}.exe"
80869
80870 -"$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "QT_BUILD_TREE=$OUTDIR" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
80871 +echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
80872 +"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
80873
80874 if [ "$VERBOSE" = "yes" ]; then
80875 $MAKE
80876 --
80877 1.7.10.4
80878
80879
80880 From 6a5e0ddd8a49120e14638ff905d7535b3a83d0f9 Mon Sep 17 00:00:00 2001
80881 From: Mark Brand <mabrand@mabrand.nl>
80882 Date: Sun, 16 Sep 2012 00:12:53 +0200
80883 Subject: [PATCH 21/23] postpone pkg-config detection until after qmake is
80884 built
80885
80886 pkg-config isn't used before qmake is built, so detecting it can take
80887 place afterwards. This is preparation for using qmake to resolve
80888 PKG_CONFIG define in mkspecs.
80889
80890 Change-Id: Icedf9ebd80bbac3fe1e5d7eeca358cb0fc9de072
80891
80892 diff --git a/configure b/configure
80893 index a0786da..53d0506 100755
80894 --- a/configure
80895 +++ b/configure
80896 @@ -3330,64 +3330,9 @@ if [ "$OPT_VERBOSE" = "yes" ]; then
80897 fi
80898
80899 #-------------------------------------------------------------------------------
80900 -# write out device config before we run the test.
80901 -#-------------------------------------------------------------------------------
80902 -DEVICE_VARS_OUTFILE="$outpath/mkspecs/qdevice.pri"
80903 -if cmp -s "$DEVICE_VARS_FILE" "$DEVICE_VARS_OUTFILE"; then
80904 - rm -f "$DEVICE_VARS_FILE"
80905 -else
80906 - mv -f $DEVICE_VARS_FILE "$DEVICE_VARS_OUTFILE"
80907 - DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE"
80908 -fi
80909 -
80910 -#-------------------------------------------------------------------------------
80911 # tests that don't need qmake (must be run before displaying help)
80912 #-------------------------------------------------------------------------------
80913
80914 -if [ -z "$PKG_CONFIG" ]; then
80915 - # See if PKG_CONFIG is set in the mkspec:
80916 - PKG_CONFIG=`getXQMakeConf PKG_CONFIG`
80917 -fi
80918 -if [ -z "$PKG_CONFIG" ]; then
80919 - PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
80920 -fi
80921 -
80922 -# Work out if we can use pkg-config
80923 -if [ "$QT_CROSS_COMPILE" = "yes" ]; then
80924 - if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then
80925 - echo >&2 ""
80926 - echo >&2 "You have asked to use pkg-config and are cross-compiling."
80927 - echo >&2 "Please make sure you have a correctly set-up pkg-config"
80928 - echo >&2 "environment!"
80929 - echo >&2 ""
80930 - if [ -z "$PKG_CONFIG_PATH" ]; then
80931 - echo >&2 ""
80932 - echo >&2 "Warning: PKG_CONFIG_PATH has not been set. This could mean"
80933 - echo >&2 "the host compiler's .pc files will be used. This is probably"
80934 - echo >&2 "not what you want."
80935 - echo >&2 ""
80936 - elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
80937 - echo >&2 ""
80938 - echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not"
80939 - echo >&2 "been set. This means your toolchain's .pc files must contain"
80940 - echo >&2 "the paths to the toolchain's libraries & headers. If configure"
80941 - echo >&2 "tests are failing, please check these files."
80942 - echo >&2 ""
80943 - fi
80944 - else
80945 - echo >&2 ""
80946 - echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling."
80947 - echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for"
80948 - echo >&2 "dependencies"
80949 - echo >&2 ""
80950 - PKG_CONFIG=""
80951 - fi
80952 -fi
80953 -
80954 -if [ ! -n "$PKG_CONFIG" ]; then
80955 - QT_CONFIG="$QT_CONFIG no-pkg-config"
80956 -fi
80957 -
80958 # process CFG_MAC_ARCHS
80959 if [ "$PLATFORM_MAC" = "yes" ]; then
80960 # check -arch arguments for validity.
80961 @@ -5058,6 +5003,61 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
80962 fi # Build qmake
80963
80964 #-------------------------------------------------------------------------------
80965 +# write out device config before we run the test.
80966 +#-------------------------------------------------------------------------------
80967 +DEVICE_VARS_OUTFILE="$outpath/mkspecs/qdevice.pri"
80968 +if cmp -s "$DEVICE_VARS_FILE" "$DEVICE_VARS_OUTFILE"; then
80969 + rm -f "$DEVICE_VARS_FILE"
80970 +else
80971 + mv -f $DEVICE_VARS_FILE "$DEVICE_VARS_OUTFILE"
80972 + DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE"
80973 +fi
80974 +
80975 +if [ -z "$PKG_CONFIG" ]; then
80976 + # See if PKG_CONFIG is set in the mkspec:
80977 + PKG_CONFIG=`getXQMakeConf PKG_CONFIG`
80978 +fi
80979 +if [ -z "$PKG_CONFIG" ]; then
80980 + PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
80981 +fi
80982 +
80983 +# Work out if we can use pkg-config
80984 +if [ "$QT_CROSS_COMPILE" = "yes" ]; then
80985 + if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then
80986 + echo >&2 ""
80987 + echo >&2 "You have asked to use pkg-config and are cross-compiling."
80988 + echo >&2 "Please make sure you have a correctly set-up pkg-config"
80989 + echo >&2 "environment!"
80990 + echo >&2 ""
80991 + if [ -z "$PKG_CONFIG_PATH" ]; then
80992 + echo >&2 ""
80993 + echo >&2 "Warning: PKG_CONFIG_PATH has not been set. This could mean"
80994 + echo >&2 "the host compiler's .pc files will be used. This is probably"
80995 + echo >&2 "not what you want."
80996 + echo >&2 ""
80997 + elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then
80998 + echo >&2 ""
80999 + echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not"
81000 + echo >&2 "been set. This means your toolchain's .pc files must contain"
81001 + echo >&2 "the paths to the toolchain's libraries & headers. If configure"
81002 + echo >&2 "tests are failing, please check these files."
81003 + echo >&2 ""
81004 + fi
81005 + else
81006 + echo >&2 ""
81007 + echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling."
81008 + echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for"
81009 + echo >&2 "dependencies"
81010 + echo >&2 ""
81011 + PKG_CONFIG=""
81012 + fi
81013 +fi
81014 +
81015 +if [ ! -n "$PKG_CONFIG" ]; then
81016 + QT_CONFIG="$QT_CONFIG no-pkg-config"
81017 +fi
81018 +
81019 +#-------------------------------------------------------------------------------
81020 # tests that need qmake
81021 #-------------------------------------------------------------------------------
81022
81023 --
81024 1.7.10.4
81025
81026
81027 From aa1b1c8519667f664cbb74e47a350d54ca679652 Mon Sep 17 00:00:00 2001
81028 From: Mark Brand <mabrand@mabrand.nl>
81029 Date: Fri, 14 Sep 2012 10:03:18 +0200
81030 Subject: [PATCH 22/23] use qmake to get PKG_CONFIG in configure script
81031
81032 PKG_CONFIG might be set in qmake.conf and prefixed with CROSS_COMPILE,
81033 which is part of the device configuration. The shell functions of
81034 configure are not smart enough to put this together, but qmake is
81035 pretty good at it now.
81036
81037 Change-Id: I1c9558e550c48e8441ebdac34b82066473c2ce3a
81038
81039 diff --git a/configure b/configure
81040 index 53d0506..211476d 100755
81041 --- a/configure
81042 +++ b/configure
81043 @@ -5015,7 +5015,11 @@ fi
81044
81045 if [ -z "$PKG_CONFIG" ]; then
81046 # See if PKG_CONFIG is set in the mkspec:
81047 - PKG_CONFIG=`getXQMakeConf PKG_CONFIG`
81048 + (echo TEMPLATE = subdirs
81049 + echo 'message($$PKG_CONFIG)') > "$outpath/dummy.pro"
81050 + echo "QT_BUILD_TREE = $outpath" > "$outpath/.qmake.cache.pkgconfig"
81051 + PKG_CONFIG="`"$outpath/bin/qmake" -cache "$outpath/.qmake.cache.pkgconfig" -spec "$XQMAKESPEC" "$outpath/dummy.pro" -o /dev/null 2>&1 1>&- | sed -n -e 's,Project MESSAGE: \(.*\),\1,p'`"
81052 + rm "$outpath/.qmake.cache.pkgconfig" "$outpath/dummy.pro"
81053 fi
81054 if [ -z "$PKG_CONFIG" ]; then
81055 PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null`
81056 --
81057 1.7.10.4
81058
81059
81060 From 8616d85fa85714f69b0599f9ba3b5445db5ecde5 Mon Sep 17 00:00:00 2001
81061 From: Mark Brand <mabrand@mabrand.nl>
81062 Date: Sun, 16 Sep 2012 00:07:12 +0200
81063 Subject: [PATCH 23/23] add PKG_CONFIG in mkspec (MXE)
81064
81065 Change-Id: I14c92e6cbd7d8f4d4762b004016dad30b0c86f50
81066
81067 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
81068 index 2cd2214..af9d799 100644
81069 --- a/mkspecs/win32-g++/qmake.conf
81070 +++ b/mkspecs/win32-g++/qmake.conf
81071 @@ -114,4 +114,5 @@ QMAKE_ZIP = zip -r -9
81072
81073 QMAKE_STRIP = $${CROSS_COMPILE}strip
81074 QMAKE_STRIPFLAGS_LIB += --strip-unneeded
81075 +PKG_CONFIG = $${CROSS_COMPILE}pkg-config
81076 load(qt_config)
81077 --
81078 1.7.10.4
81079