diff options
author | Mark Brand <mabrand@mabrand.nl> | 2012-11-29 20:10:21 (GMT) |
---|---|---|
committer | Mark Brand <mabrand@mabrand.nl> | 2012-11-29 20:10:21 (GMT) |
commit | 06c7c91ac7b514c95d94c40eb257e7d4af875820 (patch) | |
tree | 21309293674cbb390c6c1f882bcc8d9f882229cc | |
parent | 226387cd940c403abf8384a0b2f33c817574967b (diff) | |
download | mxe-06c7c91ac7b514c95d94c40eb257e7d4af875820.zip mxe-06c7c91ac7b514c95d94c40eb257e7d4af875820.tar.gz mxe-06c7c91ac7b514c95d94c40eb257e7d4af875820.tar.bz2 |
update package qt
-rw-r--r-- | index.html | 2 | ||||
-rw-r--r-- | src/qt-1-cherrypicks.patch | 2744 | ||||
-rw-r--r-- | src/qt.mk | 2 |
3 files changed, 1138 insertions, 1610 deletions
@@ -1810,7 +1810,7 @@ USE_OSGPLUGIN(<plugin2>) </tr> <tr> <td id="qt-package">qt</td> - <td id="qt-version">4.8.3</td> + <td id="qt-version">4.8.4</td> <td id="qt-website"><a href="http://qt.nokia.com/">Qt</a></td> </tr> <tr> diff --git a/src/qt-1-cherrypicks.patch b/src/qt-1-cherrypicks.patch index 558cdaa..581bcff 100644 --- a/src/qt-1-cherrypicks.patch +++ b/src/qt-1-cherrypicks.patch @@ -5,10 +5,10 @@ Commits backported (cherry-picked) from upstream branch or merge requests. http://qt.gitorious.org/qt Also contains MXE specific fixes. -From 2a376d8ff643ec0d40fdba68a25c3a323dbd5be4 Mon Sep 17 00:00:00 2001 +From 26c66cfa7befc296f0c2196e4cc05f6fbc4ff927 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 13 Jan 2012 00:17:48 +0100 -Subject: [PATCH 01/24] remove trailing whitespace +Subject: [PATCH 01/15] remove trailing whitespace backported from qt5/qtbase Change-Id: If53a0bd1794e69b4856f993c6e2959369bd007d6 @@ -32,10 +32,10 @@ index 9090773..859ec8d 100644 1.7.10.4 -From f9650fb05bde43a8d710469daa363383e3947e3a Mon Sep 17 00:00:00 2001 +From 55f1b97b2a5e81ab5cb619cc4534268c1b6b33b6 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 30 Jun 2011 10:22:33 +0200 -Subject: [PATCH 02/24] do not detect or configure iconv for Windows +Subject: [PATCH 02/15] do not detect or configure iconv for Windows Qt doesn't use iconv on Windows, but configuring it will appear to work and the build will complete. The result is that character @@ -50,10 +50,10 @@ Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 9fa2b641ba6ff4f4b3f474b87ddb642cfa5c3d83) diff --git a/configure b/configure -index d19f443..520ffc3 100755 +index e3d464b..699a35c 100755 --- a/configure +++ b/configure -@@ -5682,7 +5682,7 @@ fi +@@ -5752,7 +5752,7 @@ fi # auto-detect iconv(3) support if [ "$CFG_ICONV" != "no" ]; then @@ -66,10 +66,10 @@ index d19f443..520ffc3 100755 1.7.10.4 -From 04a44c0d6b3272c6edb08d34cecf36825843c2a0 Mon Sep 17 00:00:00 2001 +From f29250542c9d73b69ae4711d152811dca9e111ce Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 18 Jan 2012 11:43:10 +0100 -Subject: [PATCH 03/24] fix whitespace +Subject: [PATCH 03/15] fix whitespace backported from qt5/qtbase Change-Id: I0cfccae085c000d4368386a34f288c1e6f01a88f @@ -140,10 +140,10 @@ index 859ec8d..70cd890 100644 1.7.10.4 -From 043a2cdc024dd19685a1cd3694faa0cdbade5a82 Mon Sep 17 00:00:00 2001 +From 6858fb1d980c4121ea53eff9ecdb746cad0ea729 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 4 Jul 2011 00:42:24 +0200 -Subject: [PATCH 04/24] build and load text codecs regardless of iconv and +Subject: [PATCH 04/15] build and load text codecs regardless of iconv and platform Otherwise applications linking to static Qt may have to import @@ -224,24 +224,24 @@ index 70cd890..c847264 100644 } symbian:LIBS += -lcharconv diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index 08d954c..f267acb 100644 +index ca5c879..780ff5d 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -66,15 +66,14 @@ # include "qtsciicodec_p.h" # include "qisciicodec_p.h" #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) --# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) +-# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) -// no iconv(3) support, must build all codecs into the library -+# if !defined(QT_BOOTSTRAPPED) ++# if !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) # include "../../plugins/codecs/cn/qgb18030codec.h" # include "../../plugins/codecs/jp/qeucjpcodec.h" # include "../../plugins/codecs/jp/qjiscodec.h" # include "../../plugins/codecs/jp/qsjiscodec.h" # include "../../plugins/codecs/kr/qeuckrcodec.h" # include "../../plugins/codecs/tw/qbig5codec.h" --# endif // QT_NO_ICONV -+# endif // !QT_BOOTSTRAPPED +-# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS ++# endif // !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" # include "../../plugins/codecs/jp/qfontjpcodec.h" @@ -264,8 +264,8 @@ index 08d954c..f267acb 100644 #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) --# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) -+# if !defined(QT_BOOTSTRAPPED) +-# if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) ++# if !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) // no asian codecs when bootstrapping, sorry (void)new QGb18030Codec; (void)new QGbkCodec; @@ -273,8 +273,8 @@ index 08d954c..f267acb 100644 (void)new QCP949Codec; (void)new QBig5Codec; (void)new QBig5hkscsCodec; --# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED -+# endif // !QT_BOOTSTRAPPED +-# endif // QT_NO_ICONV && !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS ++# endif // !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS #endif //Q_OS_SYMBIAN #endif // QT_NO_CODECS @@ -282,10 +282,10 @@ index 08d954c..f267acb 100644 1.7.10.4 -From c9e946e08850c2ea92c818bcef9b4f0ec47fb86f Mon Sep 17 00:00:00 2001 +From 945790530a3461ba920eed32e65f32cddff7cc24 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Fri, 13 Jan 2012 00:24:13 +0100 -Subject: [PATCH 05/24] move plugin text codecs to QtCore +Subject: [PATCH 05/15] move plugin text codecs to QtCore Having plugin text codecs adds considerable complexity to configuring Qt. The plugin interface is designed for optional @@ -363,45 +363,45 @@ index c847264..a1271b9 100644 SOURCES += codecs/qfontlaocodec.cpp diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h new file mode 100644 -index 0000000..8bf9204 +index 0000000..9fea76f --- /dev/null +++ b/src/corelib/codecs/cp949codetbl_p.h @@ -0,0 +1,637 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -1006,45 +1006,45 @@ index 0000000..8bf9204 +#endif // CP494CODETBL_H diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp new file mode 100644 -index 0000000..662aee8 +index 0000000..3018d5c --- /dev/null +++ b/src/corelib/codecs/qbig5codec.cpp @@ -0,0 +1,12788 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -13800,45 +13800,45 @@ index 0000000..662aee8 +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h new file mode 100644 -index 0000000..eec1798 +index 0000000..93f3dfb --- /dev/null +++ b/src/corelib/codecs/qbig5codec_p.h @@ -0,0 +1,124 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -13930,45 +13930,45 @@ index 0000000..eec1798 +#endif // QBIG5CODEC_H diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp new file mode 100644 -index 0000000..69e314c +index 0000000..646b231 --- /dev/null +++ b/src/corelib/codecs/qeucjpcodec.cpp @@ -0,0 +1,261 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -14197,45 +14197,45 @@ index 0000000..69e314c +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h new file mode 100644 -index 0000000..d693e04 +index 0000000..a42df14 --- /dev/null +++ b/src/corelib/codecs/qeucjpcodec_p.h @@ -0,0 +1,106 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -14309,45 +14309,45 @@ index 0000000..d693e04 +#endif // QEUCJPCODEC_H diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp new file mode 100644 -index 0000000..bef4132 +index 0000000..4181f10 --- /dev/null +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -0,0 +1,3571 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -17886,45 +17886,45 @@ index 0000000..bef4132 +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h new file mode 100644 -index 0000000..55a1337 +index 0000000..f05505e --- /dev/null +++ b/src/corelib/codecs/qeuckrcodec_p.h @@ -0,0 +1,129 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -18021,45 +18021,45 @@ index 0000000..55a1337 +#endif // QEUCKRCODEC_H diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp new file mode 100644 -index 0000000..2ac3d6c +index 0000000..ab21dce --- /dev/null +++ b/src/corelib/codecs/qfontjpcodec.cpp @@ -0,0 +1,145 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -18172,45 +18172,45 @@ index 0000000..2ac3d6c +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h new file mode 100644 -index 0000000..dfb06bb +index 0000000..d884cb7 --- /dev/null +++ b/src/corelib/codecs/qfontjpcodec_p.h @@ -0,0 +1,93 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -18271,45 +18271,45 @@ index 0000000..dfb06bb +#endif // QFONTJPCODEC_H diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp new file mode 100644 -index 0000000..928bc52 +index 0000000..ed6a01a --- /dev/null +++ b/src/corelib/codecs/qgb18030codec.cpp @@ -0,0 +1,9265 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -27542,45 +27542,45 @@ index 0000000..928bc52 +#endif // QT_NO_TEXTCODEC diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h new file mode 100644 -index 0000000..3e082bf +index 0000000..62e4dc0 --- /dev/null +++ b/src/corelib/codecs/qgb18030codec_p.h @@ -0,0 +1,159 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -27707,45 +27707,45 @@ index 0000000..3e082bf +#endif // QGB18030CODEC_H diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp new file mode 100644 -index 0000000..dd80541 +index 0000000..28ead1a --- /dev/null +++ b/src/corelib/codecs/qjiscodec.cpp @@ -0,0 +1,367 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -28080,45 +28080,45 @@ index 0000000..dd80541 +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h new file mode 100644 -index 0000000..dcdb04d +index 0000000..59d73c9 --- /dev/null +++ b/src/corelib/codecs/qjiscodec_p.h @@ -0,0 +1,106 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -28192,45 +28192,45 @@ index 0000000..dcdb04d +#endif // QJISCODEC_H diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp new file mode 100644 -index 0000000..ffd8829 +index 0000000..b479f98 --- /dev/null +++ b/src/corelib/codecs/qjpunicode.cpp @@ -0,0 +1,10700 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -38898,45 +38898,45 @@ index 0000000..ffd8829 +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h new file mode 100644 -index 0000000..a5bdd0c +index 0000000..f2cb394 --- /dev/null +++ b/src/corelib/codecs/qjpunicode_p.h @@ -0,0 +1,174 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -39078,45 +39078,45 @@ index 0000000..a5bdd0c +#endif // QJPUNICODE_H diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp new file mode 100644 -index 0000000..f03cd26 +index 0000000..0c8c9d9 --- /dev/null +++ b/src/corelib/codecs/qsjiscodec.cpp @@ -0,0 +1,229 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -39313,45 +39313,45 @@ index 0000000..f03cd26 +QT_END_NAMESPACE diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h new file mode 100644 -index 0000000..3d3cde7 +index 0000000..c631dea --- /dev/null +++ b/src/corelib/codecs/qsjiscodec_p.h @@ -0,0 +1,106 @@ +/**************************************************************************** +** -+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -+** Contact: http://www.qt-project.org/ ++** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ++** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and Digia. For licensing terms and ++** conditions see http://qt.digia.com/licensing. For further information ++** use the contact form at http://qt.digia.com/contact-us. ++** +** GNU Lesser General Public License Usage -+** This file may be used under the terms of the GNU Lesser General Public -+** License version 2.1 as published by the Free Software Foundation and -+** appearing in the file LICENSE.LGPL included in the packaging of this -+** file. Please review the following information to ensure the GNU Lesser -+** General Public License version 2.1 requirements will be met: -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 2.1 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 2.1 requirements ++** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** -+** In addition, as a special exception, Nokia gives you certain additional -+** rights. These rights are described in the Nokia Qt LGPL Exception ++** In addition, as a special exception, Digia gives you certain additional ++** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU General -+** Public License version 3.0 as published by the Free Software Foundation -+** and appearing in the file LICENSE.GPL included in the packaging of this -+** file. Please review the following information to ensure the GNU General -+** Public License version 3.0 requirements will be met: -+** http://www.gnu.org/copyleft/gpl.html. -+** -+** Other Usage -+** Alternatively, this file may be used in accordance with the terms and -+** conditions contained in a signed written agreement between you and Nokia. -+** -+** -+** -+** ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 3.0 as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU General Public License version 3.0 requirements will be ++** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ @@ -39424,13 +39424,13 @@ index 0000000..3d3cde7 + +#endif // QSJISCODEC_H diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index f267acb..b6ed5e6 100644 +index 780ff5d..25edf90 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -67,16 +67,16 @@ # include "qisciicodec_p.h" #if !defined(Q_OS_SYMBIAN) && !defined(Q_OS_INTEGRITY) - # if !defined(QT_BOOTSTRAPPED) + # if !defined(QT_BOOTSTRAPPED) && !defined(QT_CODEC_PLUGINS) -# include "../../plugins/codecs/cn/qgb18030codec.h" -# include "../../plugins/codecs/jp/qeucjpcodec.h" -# include "../../plugins/codecs/jp/qjiscodec.h" @@ -39443,7 +39443,7 @@ index f267acb..b6ed5e6 100644 +# include "qsjiscodec_p.h" +# include "qeuckrcodec_p.h" +# include "qbig5codec_p.h" - # endif // !QT_BOOTSTRAPPED + # endif // !QT_BOOTSTRAPPED && !QT_CODEC_PLUGINS # if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED) # include "qfontlaocodec_p.h" -# include "../../plugins/codecs/jp/qfontjpcodec.h" @@ -39475,45 +39475,45 @@ index b0a8a91..0000000 -symbian:TARGET.UID3=0x2001E615 diff --git a/src/plugins/codecs/cn/main.cpp b/src/plugins/codecs/cn/main.cpp deleted file mode 100644 -index 93b8b72..0000000 +index 0226c17..0000000 --- a/src/plugins/codecs/cn/main.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -39626,45 +39626,45 @@ index 93b8b72..0000000 -#endif // QT_NO_TEXTCODECPLUGIN diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp deleted file mode 100644 -index 928bc52..0000000 +index ed6a01a..0000000 --- a/src/plugins/codecs/cn/qgb18030codec.cpp +++ /dev/null @@ -1,9265 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -48897,45 +48897,45 @@ index 928bc52..0000000 -#endif // QT_NO_TEXTCODEC diff --git a/src/plugins/codecs/cn/qgb18030codec.h b/src/plugins/codecs/cn/qgb18030codec.h deleted file mode 100644 -index 3e082bf..0000000 +index 62e4dc0..0000000 --- a/src/plugins/codecs/cn/qgb18030codec.h +++ /dev/null @@ -1,159 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49105,45 +49105,45 @@ index 6480e43..0000000 -symbian:TARGET.UID3=0x2001E614 diff --git a/src/plugins/codecs/jp/main.cpp b/src/plugins/codecs/jp/main.cpp deleted file mode 100644 -index 6eee02f..0000000 +index 89c16bf..0000000 --- a/src/plugins/codecs/jp/main.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49260,45 +49260,45 @@ index 6eee02f..0000000 -#endif // QT_NO_TEXTCODECPLUGIN diff --git a/src/plugins/codecs/jp/qeucjpcodec.cpp b/src/plugins/codecs/jp/qeucjpcodec.cpp deleted file mode 100644 -index 69e314c..0000000 +index 646b231..0000000 --- a/src/plugins/codecs/jp/qeucjpcodec.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49527,45 +49527,45 @@ index 69e314c..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/jp/qeucjpcodec.h b/src/plugins/codecs/jp/qeucjpcodec.h deleted file mode 100644 -index d693e04..0000000 +index a42df14..0000000 --- a/src/plugins/codecs/jp/qeucjpcodec.h +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49639,45 +49639,45 @@ index d693e04..0000000 -#endif // QEUCJPCODEC_H diff --git a/src/plugins/codecs/jp/qfontjpcodec.cpp b/src/plugins/codecs/jp/qfontjpcodec.cpp deleted file mode 100644 -index 2ac3d6c..0000000 +index ab21dce..0000000 --- a/src/plugins/codecs/jp/qfontjpcodec.cpp +++ /dev/null @@ -1,145 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49790,45 +49790,45 @@ index 2ac3d6c..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/jp/qfontjpcodec.h b/src/plugins/codecs/jp/qfontjpcodec.h deleted file mode 100644 -index dfb06bb..0000000 +index d884cb7..0000000 --- a/src/plugins/codecs/jp/qfontjpcodec.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -49889,45 +49889,45 @@ index dfb06bb..0000000 -#endif // QFONTJPCODEC_H diff --git a/src/plugins/codecs/jp/qjiscodec.cpp b/src/plugins/codecs/jp/qjiscodec.cpp deleted file mode 100644 -index dd80541..0000000 +index 28ead1a..0000000 --- a/src/plugins/codecs/jp/qjiscodec.cpp +++ /dev/null @@ -1,367 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -50262,45 +50262,45 @@ index dd80541..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/jp/qjiscodec.h b/src/plugins/codecs/jp/qjiscodec.h deleted file mode 100644 -index dcdb04d..0000000 +index 59d73c9..0000000 --- a/src/plugins/codecs/jp/qjiscodec.h +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -50374,45 +50374,45 @@ index dcdb04d..0000000 -#endif // QJISCODEC_H diff --git a/src/plugins/codecs/jp/qjpunicode.cpp b/src/plugins/codecs/jp/qjpunicode.cpp deleted file mode 100644 -index ffd8829..0000000 +index b479f98..0000000 --- a/src/plugins/codecs/jp/qjpunicode.cpp +++ /dev/null @@ -1,10700 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -61080,45 +61080,45 @@ index ffd8829..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/jp/qjpunicode.h b/src/plugins/codecs/jp/qjpunicode.h deleted file mode 100644 -index a5bdd0c..0000000 +index f2cb394..0000000 --- a/src/plugins/codecs/jp/qjpunicode.h +++ /dev/null @@ -1,174 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -61260,45 +61260,45 @@ index a5bdd0c..0000000 -#endif // QJPUNICODE_H diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp deleted file mode 100644 -index f03cd26..0000000 +index 0c8c9d9..0000000 --- a/src/plugins/codecs/jp/qsjiscodec.cpp +++ /dev/null @@ -1,229 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -61495,45 +61495,45 @@ index f03cd26..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/jp/qsjiscodec.h b/src/plugins/codecs/jp/qsjiscodec.h deleted file mode 100644 -index 3d3cde7..0000000 +index c631dea..0000000 --- a/src/plugins/codecs/jp/qsjiscodec.h +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -61607,45 +61607,45 @@ index 3d3cde7..0000000 -#endif // QSJISCODEC_H diff --git a/src/plugins/codecs/kr/cp949codetbl.h b/src/plugins/codecs/kr/cp949codetbl.h deleted file mode 100644 -index 8bf9204..0000000 +index 9fea76f..0000000 --- a/src/plugins/codecs/kr/cp949codetbl.h +++ /dev/null @@ -1,637 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -62276,45 +62276,45 @@ index 1cc28d8..0000000 -symbian:TARGET.UID3=0x2001B2E5 diff --git a/src/plugins/codecs/kr/main.cpp b/src/plugins/codecs/kr/main.cpp deleted file mode 100644 -index cbfd133..0000000 +index 2cae1ed..0000000 --- a/src/plugins/codecs/kr/main.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -62413,45 +62413,45 @@ index cbfd133..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/kr/qeuckrcodec.cpp b/src/plugins/codecs/kr/qeuckrcodec.cpp deleted file mode 100644 -index bef4132..0000000 +index 4181f10..0000000 --- a/src/plugins/codecs/kr/qeuckrcodec.cpp +++ /dev/null @@ -1,3571 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -65990,45 +65990,45 @@ index bef4132..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/kr/qeuckrcodec.h b/src/plugins/codecs/kr/qeuckrcodec.h deleted file mode 100644 -index 55a1337..0000000 +index f05505e..0000000 --- a/src/plugins/codecs/kr/qeuckrcodec.h +++ /dev/null @@ -1,129 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -66125,45 +66125,45 @@ index 55a1337..0000000 -#endif // QEUCKRCODEC_H diff --git a/src/plugins/codecs/tw/main.cpp b/src/plugins/codecs/tw/main.cpp deleted file mode 100644 -index 4536e67..0000000 +index a5f9727..0000000 --- a/src/plugins/codecs/tw/main.cpp +++ /dev/null @@ -1,138 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -66269,45 +66269,45 @@ index 4536e67..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/tw/qbig5codec.cpp b/src/plugins/codecs/tw/qbig5codec.cpp deleted file mode 100644 -index 662aee8..0000000 +index 3018d5c..0000000 --- a/src/plugins/codecs/tw/qbig5codec.cpp +++ /dev/null @@ -1,12788 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -79063,45 +79063,45 @@ index 662aee8..0000000 -QT_END_NAMESPACE diff --git a/src/plugins/codecs/tw/qbig5codec.h b/src/plugins/codecs/tw/qbig5codec.h deleted file mode 100644 -index eec1798..0000000 +index 93f3dfb..0000000 --- a/src/plugins/codecs/tw/qbig5codec.h +++ /dev/null @@ -1,124 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -79233,10 +79233,10 @@ index 94ce675..c4af49b 100644 1.7.10.4 -From 7c457dbd99e5865f13499146e9487e9cb4b86868 Mon Sep 17 00:00:00 2001 +From 804f0db4ce4f40bee7178dab70500032e2163e9c Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 18 Jan 2012 21:01:26 +0100 -Subject: [PATCH 06/24] update private header references +Subject: [PATCH 06/15] update private header references backported from qt5/qtbase Change-Id: I092d879653b6900532a0c4534c1eb2be84e9d0f6 @@ -79245,7 +79245,7 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 15e4df7d83fd30e16f014bc1ddc5d55884b388aa) diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp -index 662aee8..cd39ea0 100644 +index 3018d5c..cb0ec89 100644 --- a/src/corelib/codecs/qbig5codec.cpp +++ b/src/corelib/codecs/qbig5codec.cpp @@ -39,7 +39,7 @@ @@ -79258,7 +79258,7 @@ index 662aee8..cd39ea0 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp -index 69e314c..091ad4d 100644 +index 646b231..11516dc 100644 --- a/src/corelib/codecs/qeucjpcodec.cpp +++ b/src/corelib/codecs/qeucjpcodec.cpp @@ -73,7 +73,7 @@ @@ -79271,7 +79271,7 @@ index 69e314c..091ad4d 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h -index d693e04..a5cd119 100644 +index a42df14..5531a7a 100644 --- a/src/corelib/codecs/qeucjpcodec_p.h +++ b/src/corelib/codecs/qeucjpcodec_p.h @@ -71,7 +71,7 @@ @@ -79284,7 +79284,7 @@ index d693e04..a5cd119 100644 #include <QtCore/qlist.h> diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp -index bef4132..f91442f 100644 +index 4181f10..2722e9c 100644 --- a/src/corelib/codecs/qeuckrcodec.cpp +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -65,8 +65,8 @@ @@ -79299,7 +79299,7 @@ index bef4132..f91442f 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp -index 2ac3d6c..590d72d 100644 +index ab21dce..28da021 100644 --- a/src/corelib/codecs/qfontjpcodec.cpp +++ b/src/corelib/codecs/qfontjpcodec.cpp @@ -39,9 +39,9 @@ @@ -79315,7 +79315,7 @@ index 2ac3d6c..590d72d 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp -index 928bc52..5c0e701 100644 +index ed6a01a..75e5639 100644 --- a/src/corelib/codecs/qgb18030codec.cpp +++ b/src/corelib/codecs/qgb18030codec.cpp @@ -44,7 +44,7 @@ @@ -79328,7 +79328,7 @@ index 928bc52..5c0e701 100644 #ifndef QT_NO_TEXTCODEC diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp -index dd80541..1831170 100644 +index 28ead1a..ff2fbd8 100644 --- a/src/corelib/codecs/qjiscodec.cpp +++ b/src/corelib/codecs/qjiscodec.cpp @@ -48,7 +48,7 @@ @@ -79341,7 +79341,7 @@ index dd80541..1831170 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h -index dcdb04d..bb59c33 100644 +index 59d73c9..b46e388 100644 --- a/src/corelib/codecs/qjiscodec_p.h +++ b/src/corelib/codecs/qjiscodec_p.h @@ -71,7 +71,7 @@ @@ -79354,7 +79354,7 @@ index dcdb04d..bb59c33 100644 #include <QtCore/qlist.h> diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp -index ffd8829..7827ef3 100644 +index b479f98..bcc07f2 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -44,7 +44,7 @@ @@ -79367,7 +79367,7 @@ index ffd8829..7827ef3 100644 #include "qbytearray.h" #include <stdlib.h> diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp -index f03cd26..97e6000 100644 +index 0c8c9d9..b728267 100644 --- a/src/corelib/codecs/qsjiscodec.cpp +++ b/src/corelib/codecs/qsjiscodec.cpp @@ -48,7 +48,7 @@ @@ -79380,7 +79380,7 @@ index f03cd26..97e6000 100644 QT_BEGIN_NAMESPACE diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h -index 3d3cde7..4910bfd 100644 +index c631dea..e82efde 100644 --- a/src/corelib/codecs/qsjiscodec_p.h +++ b/src/corelib/codecs/qsjiscodec_p.h @@ -71,7 +71,7 @@ @@ -79396,10 +79396,10 @@ index 3d3cde7..4910bfd 100644 1.7.10.4 -From 2be2accfee23fee3a9d97e5852ff9d2a01a7c33f Mon Sep 17 00:00:00 2001 +From b314e24c94453f7eca253e50f126f310e7467a67 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 3 Jul 2011 21:53:27 +0200 -Subject: [PATCH 07/24] cosmetic adjustments for files moved to core/codecs +Subject: [PATCH 07/15] cosmetic adjustments for files moved to core/codecs -update old reference to 'plugin' -rename multiple inclusion guards @@ -79412,18 +79412,18 @@ Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 712cfb509484599f1586f68cc379e3e7464e9967) diff --git a/src/corelib/codecs/cp949codetbl_p.h b/src/corelib/codecs/cp949codetbl_p.h -index 8bf9204..228c5ad 100644 +index 9fea76f..bc77a34 100644 --- a/src/corelib/codecs/cp949codetbl_p.h +++ b/src/corelib/codecs/cp949codetbl_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -39,8 +39,19 @@ ** ****************************************************************************/ @@ -79453,31 +79453,31 @@ index 8bf9204..228c5ad 100644 -#endif // CP494CODETBL_H +#endif // CP494CODETBL_P_H diff --git a/src/corelib/codecs/qbig5codec.cpp b/src/corelib/codecs/qbig5codec.cpp -index cd39ea0..13b317f 100644 +index cb0ec89..9861e5e 100644 --- a/src/corelib/codecs/qbig5codec.cpp +++ b/src/corelib/codecs/qbig5codec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h -index eec1798..674c513 100644 +index 93f3dfb..5dffc67 100644 --- a/src/corelib/codecs/qbig5codec_p.h +++ b/src/corelib/codecs/qbig5codec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -43,8 +43,19 @@ // is included in Qt with the author's permission, and the grateful // thanks of the Qt team. @@ -79507,31 +79507,31 @@ index eec1798..674c513 100644 -#endif // QBIG5CODEC_H +#endif // QBIG5CODEC_P_H diff --git a/src/corelib/codecs/qeucjpcodec.cpp b/src/corelib/codecs/qeucjpcodec.cpp -index 091ad4d..773c473 100644 +index 11516dc..5c71139 100644 --- a/src/corelib/codecs/qeucjpcodec.cpp +++ b/src/corelib/codecs/qeucjpcodec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qeucjpcodec_p.h b/src/corelib/codecs/qeucjpcodec_p.h -index a5cd119..97d8523 100644 +index 5531a7a..9e77507 100644 --- a/src/corelib/codecs/qeucjpcodec_p.h +++ b/src/corelib/codecs/qeucjpcodec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -68,8 +68,19 @@ * SUCH DAMAGE. */ @@ -79561,31 +79561,31 @@ index a5cd119..97d8523 100644 -#endif // QEUCJPCODEC_H +#endif // QEUCJPCODEC_P_H diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp -index f91442f..8417bf0 100644 +index 2722e9c..a034d53 100644 --- a/src/corelib/codecs/qeuckrcodec.cpp +++ b/src/corelib/codecs/qeuckrcodec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qeuckrcodec_p.h b/src/corelib/codecs/qeuckrcodec_p.h -index 55a1337..79647b1 100644 +index f05505e..ba73c0b 100644 --- a/src/corelib/codecs/qeuckrcodec_p.h +++ b/src/corelib/codecs/qeuckrcodec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -64,8 +64,19 @@ * SUCH DAMAGE. */ @@ -79615,31 +79615,31 @@ index 55a1337..79647b1 100644 -#endif // QEUCKRCODEC_H +#endif // QEUCKRCODEC_P_H diff --git a/src/corelib/codecs/qfontjpcodec.cpp b/src/corelib/codecs/qfontjpcodec.cpp -index 590d72d..3d39524 100644 +index 28da021..7e96ce3 100644 --- a/src/corelib/codecs/qfontjpcodec.cpp +++ b/src/corelib/codecs/qfontjpcodec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qfontjpcodec_p.h b/src/corelib/codecs/qfontjpcodec_p.h -index dfb06bb..9e9b8dd 100644 +index d884cb7..96a2210 100644 --- a/src/corelib/codecs/qfontjpcodec_p.h +++ b/src/corelib/codecs/qfontjpcodec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -39,8 +39,19 @@ ** ****************************************************************************/ @@ -79669,31 +79669,31 @@ index dfb06bb..9e9b8dd 100644 -#endif // QFONTJPCODEC_H +#endif // QFONTJPCODEC_P_H diff --git a/src/corelib/codecs/qgb18030codec.cpp b/src/corelib/codecs/qgb18030codec.cpp -index 5c0e701..c5daef6 100644 +index 75e5639..7cd66d9 100644 --- a/src/corelib/codecs/qgb18030codec.cpp +++ b/src/corelib/codecs/qgb18030codec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qgb18030codec_p.h b/src/corelib/codecs/qgb18030codec_p.h -index 3e082bf..0f66211 100644 +index 62e4dc0..13ef0fb 100644 --- a/src/corelib/codecs/qgb18030codec_p.h +++ b/src/corelib/codecs/qgb18030codec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -41,8 +41,19 @@ // Contributed by James Su <suzhe@gnuchina.org> @@ -79723,31 +79723,31 @@ index 3e082bf..0f66211 100644 -#endif // QGB18030CODEC_H +#endif // QGB18030CODEC_P_H diff --git a/src/corelib/codecs/qjiscodec.cpp b/src/corelib/codecs/qjiscodec.cpp -index 1831170..83c4329 100644 +index ff2fbd8..208fd0d 100644 --- a/src/corelib/codecs/qjiscodec.cpp +++ b/src/corelib/codecs/qjiscodec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qjiscodec_p.h b/src/corelib/codecs/qjiscodec_p.h -index bb59c33..daccf57 100644 +index b46e388..90c2c6b 100644 --- a/src/corelib/codecs/qjiscodec_p.h +++ b/src/corelib/codecs/qjiscodec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -68,8 +68,19 @@ * SUCH DAMAGE. */ @@ -79777,31 +79777,31 @@ index bb59c33..daccf57 100644 -#endif // QJISCODEC_H +#endif // QJISCODEC_P_H diff --git a/src/corelib/codecs/qjpunicode.cpp b/src/corelib/codecs/qjpunicode.cpp -index 7827ef3..1e4883f 100644 +index bcc07f2..d65860d 100644 --- a/src/corelib/codecs/qjpunicode.cpp +++ b/src/corelib/codecs/qjpunicode.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qjpunicode_p.h b/src/corelib/codecs/qjpunicode_p.h -index a5bdd0c..07b5b25 100644 +index f2cb394..b8d6009 100644 --- a/src/corelib/codecs/qjpunicode_p.h +++ b/src/corelib/codecs/qjpunicode_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -68,8 +68,19 @@ * SUCH DAMAGE. */ @@ -79831,31 +79831,31 @@ index a5bdd0c..07b5b25 100644 -#endif // QJPUNICODE_H +#endif // QJPUNICODE_P_H diff --git a/src/corelib/codecs/qsjiscodec.cpp b/src/corelib/codecs/qsjiscodec.cpp -index 97e6000..27121ad 100644 +index b728267..a1f71e7 100644 --- a/src/corelib/codecs/qsjiscodec.cpp +++ b/src/corelib/codecs/qsjiscodec.cpp @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage diff --git a/src/corelib/codecs/qsjiscodec_p.h b/src/corelib/codecs/qsjiscodec_p.h -index 4910bfd..d57f94b 100644 +index e82efde..5c23ca4 100644 --- a/src/corelib/codecs/qsjiscodec_p.h +++ b/src/corelib/codecs/qsjiscodec_p.h @@ -3,7 +3,7 @@ - ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). - ** Contact: http://www.qt-project.org/ + ** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). + ** Contact: http://www.qt-project.org/legal ** -** This file is part of the plugins of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ - ** GNU Lesser General Public License Usage + ** Commercial License Usage @@ -68,8 +68,19 @@ * SUCH DAMAGE. */ @@ -79888,10 +79888,10 @@ index 4910bfd..d57f94b 100644 1.7.10.4 -From eeecdea8f15353aa0461ec09f7064f456849a3c3 Mon Sep 17 00:00:00 2001 +From 932c5edc9dd7eac3815b5802eec295b05382ab72 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 12 Jan 2012 10:43:29 +0100 -Subject: [PATCH 08/24] remove obsolete codec plugin loading code +Subject: [PATCH 08/15] remove obsolete codec plugin loading code backported from qt5/qtbase Change-Id: I1f3dbb5c10009413f701947b1b89ed3dbc94bf3d @@ -79934,7 +79934,7 @@ index a1271b9..9274eda 100644 codecs/qjpunicode.cpp \ codecs/qeucjpcodec.cpp \ diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp -index b6ed5e6..55e5b83 100644 +index 25edf90..cdf47f7 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -48,11 +48,6 @@ @@ -80082,45 +80082,45 @@ index b6ed5e6..55e5b83 100644 diff --git a/src/corelib/codecs/qtextcodecplugin.cpp b/src/corelib/codecs/qtextcodecplugin.cpp deleted file mode 100644 -index b164f31..0000000 +index d4a8244..0000000 --- a/src/corelib/codecs/qtextcodecplugin.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -80249,45 +80249,45 @@ index b164f31..0000000 -#endif // QT_NO_TEXTCODECPLUGIN diff --git a/src/corelib/codecs/qtextcodecplugin.h b/src/corelib/codecs/qtextcodecplugin.h deleted file mode 100644 -index 2873b0e..0000000 +index e6bddd1..0000000 --- a/src/corelib/codecs/qtextcodecplugin.h +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** --** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). --** Contact: http://www.qt-project.org/ +-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +-** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ +-** Commercial License Usage +-** Licensees holding valid commercial Qt licenses may use this file in +-** accordance with the commercial license agreement provided with the +-** Software or, alternatively, in accordance with the terms contained in +-** a written agreement between you and Digia. For licensing terms and +-** conditions see http://qt.digia.com/licensing. For further information +-** use the contact form at http://qt.digia.com/contact-us. +-** -** GNU Lesser General Public License Usage --** This file may be used under the terms of the GNU Lesser General Public --** License version 2.1 as published by the Free Software Foundation and --** appearing in the file LICENSE.LGPL included in the packaging of this --** file. Please review the following information to ensure the GNU Lesser --** General Public License version 2.1 requirements will be met: --** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +-** Alternatively, this file may be used under the terms of the GNU Lesser +-** General Public License version 2.1 as published by the Free Software +-** Foundation and appearing in the file LICENSE.LGPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU Lesser General Public License version 2.1 requirements +-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** --** In addition, as a special exception, Nokia gives you certain additional --** rights. These rights are described in the Nokia Qt LGPL Exception +-** In addition, as a special exception, Digia gives you certain additional +-** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage --** Alternatively, this file may be used under the terms of the GNU General --** Public License version 3.0 as published by the Free Software Foundation --** and appearing in the file LICENSE.GPL included in the packaging of this --** file. Please review the following information to ensure the GNU General --** Public License version 3.0 requirements will be met: --** http://www.gnu.org/copyleft/gpl.html. --** --** Other Usage --** Alternatively, this file may be used in accordance with the terms and --** conditions contained in a signed written agreement between you and Nokia. --** --** --** --** +-** Alternatively, this file may be used under the terms of the GNU +-** General Public License version 3.0 as published by the Free Software +-** Foundation and appearing in the file LICENSE.GPL included in the +-** packaging of this file. Please review the following information to +-** ensure the GNU General Public License version 3.0 requirements will be +-** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ @@ -80350,7 +80350,7 @@ index 2873b0e..0000000 - -#endif // QTEXTCODECPLUGIN_H diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h -index 170b2c3..9ed73aa 100644 +index 38b4252..e85dbc6 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -91,9 +91,6 @@ @@ -80364,7 +80364,7 @@ index 170b2c3..9ed73aa 100644 # define QT_NO_TRANSLATION #endif diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h -index 6781c60..707e6b1 100644 +index be4b7f8..b564edf 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -167,9 +167,6 @@ @@ -80378,7 +80378,7 @@ index 6781c60..707e6b1 100644 # define QT_NO_TRANSLATION #endif diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h -index eb4632f..7fecfec 100644 +index 9073a78..b651ee1 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -128,9 +128,6 @@ @@ -80392,7 +80392,7 @@ index eb4632f..7fecfec 100644 # define QT_NO_TRANSLATION #endif diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h -index 988dc6f..dda6567 100644 +index d96ee98..88cdf60 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -128,9 +128,6 @@ @@ -80406,7 +80406,7 @@ index 988dc6f..dda6567 100644 # define QT_NO_TRANSLATION #endif diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h -index 9612778..493269d 100644 +index 04ac185..21838ed 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -643,11 +643,6 @@ @@ -80425,10 +80425,10 @@ index 9612778..493269d 100644 1.7.10.4 -From c94d9111ef83683ea2b7db6e4070594c4a332f1c Mon Sep 17 00:00:00 2001 +From ace3dbf1f6946c16c2330e807637621be9c59dc7 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Mon, 23 Jan 2012 23:12:46 +0100 -Subject: [PATCH 09/24] remove vestiges of text codec plugins +Subject: [PATCH 09/15] remove vestiges of text codec plugins follow-up to 3a3356a85079d734dfa57205a00e1996afc033df @@ -80459,10 +80459,10 @@ index dea05e0..12cd8ea 100644 1.7.10.4 -From 415466a4ac2a87522569544a9b9ba7115fc4acf7 Mon Sep 17 00:00:00 2001 +From 48e5806ddbd8786c8e72e4835f10fdfb0038e84d Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 15:10:26 +0100 -Subject: [PATCH 10/24] use pkg-config for libmng (MXE specific) +Subject: [PATCH 10/15] use pkg-config for libmng (MXE specific) Change-Id: Ifce956d5cad06d5273088656b8500b87980063f4 @@ -80485,10 +80485,10 @@ index ffb98de..6aab68f 100644 1.7.10.4 -From 1cac3150930d5353455b560792f7e76fe180ad26 Mon Sep 17 00:00:00 2001 +From f7ab3cc652a6b63bdff144563df93373379186f0 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 -Subject: [PATCH 11/24] use pkg-config for libtiff-4 (MXE specific) +Subject: [PATCH 11/15] use pkg-config for libtiff-4 (MXE specific) Change-Id: I5e89e66fc1606d425553e781c9e62db703136957 @@ -80511,10 +80511,10 @@ index e1cc3ee..71cbab1 100644 1.7.10.4 -From 28ad5f9d9c70feba6475652c6445bbe263998d3d Mon Sep 17 00:00:00 2001 +From 05452c3fadf80400e968df08fb073fe4a0723227 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sat, 5 Jun 2010 23:41:04 +0200 -Subject: [PATCH 12/24] restore support for static linking of QtWebKit (MXE +Subject: [PATCH 12/15] restore support for static linking of QtWebKit (MXE specific) Support was removed by 4221d629e2cf37ee8c5ba7cb595b05ab8c82f113. @@ -80528,10 +80528,10 @@ Don't build Qt WebKit tests to avoid static linking problems. Change-Id: Ia969b8e3f2b656a5057c7ebf748f272d74f014da diff --git a/configure b/configure -index 520ffc3..e018443 100755 +index 699a35c..bad107a 100755 --- a/configure +++ b/configure -@@ -7683,12 +7683,6 @@ if [ "$CFG_GUI" = "no" ]; then +@@ -7749,12 +7749,6 @@ if [ "$CFG_GUI" = "no" ]; then canBuildWebKit="no" fi @@ -80614,10 +80614,10 @@ index 9be0f4a..6744f58 100644 1.7.10.4 -From ab04bc59d7caf5d04bb87bd75d2bbe98da89d599 Mon Sep 17 00:00:00 2001 +From 8ef7f77bd3fb66152e466c5d110503c14f26a12d Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:47:10 +0200 -Subject: [PATCH 13/24] fix building on GNU/kFreeBSD (MXE specific) +Subject: [PATCH 13/15] fix building on GNU/kFreeBSD (MXE specific) This patch has been taken from: @@ -80629,7 +80629,7 @@ Description: Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_FREEBSD_KERNEL. Last-Update: 2010-10-06 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index b3d4852..1a6a4a4 100644 +index 8346e46..51aed78 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -226,6 +226,8 @@ namespace QT_NAMESPACE {} @@ -80645,10 +80645,10 @@ index b3d4852..1a6a4a4 100644 1.7.10.4 -From 28bf082efa51789d404e33bfbfdbe17a8261af87 Mon Sep 17 00:00:00 2001 +From be982852ea7a223296fa7aff352f6f5e99d18b9f Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:49:47 +0200 -Subject: [PATCH 14/24] fix missing platform when building on GNU/kFreeBSD +Subject: [PATCH 14/15] fix missing platform when building on GNU/kFreeBSD (MXE specific) This patch is inspired by: @@ -80659,10 +80659,10 @@ For the time being, glibc-g++ is simply a copy of linux-g++. Change-Id: I1bebe2e6eef878318142ca5ed3525afc167b0a95 diff --git a/configure b/configure -index e018443..b600744 100755 +index bad107a..9aa9126 100755 --- a/configure +++ b/configure -@@ -2845,6 +2845,9 @@ if [ -z "$PLATFORM" ]; then +@@ -2871,6 +2871,9 @@ if [ -z "$PLATFORM" ]; then GNU:*) PLATFORM=hurd-g++ ;; @@ -80676,10 +80676,10 @@ index e018443..b600744 100755 1.7.10.4 -From f32c0852485615d6938d1cde1e0b4dc4e6262a7e Mon Sep 17 00:00:00 2001 +From 85989caf16b4e60e66e790988302243c5f5e12eb Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 1 Sep 2011 13:51:50 +0200 -Subject: [PATCH 15/24] fix building on dragonfly (MXE specific) +Subject: [PATCH 15/15] fix building on dragonfly (MXE specific) This patch is inspired by: http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27&content-type=text/x-cvsweb-markup @@ -80687,10 +80687,10 @@ http://cvsweb.NetBSD.org/bsdweb.cgi/pkgsrc/x11/qt4-libs/Makefile.common?rev=1.27 Change-Id: I9743a39ac35950cb15af915c3ae527433bc6b56d diff --git a/configure b/configure -index b600744..599203d 100755 +index 9aa9126..8643338 100755 --- a/configure +++ b/configure -@@ -2857,7 +2857,7 @@ if [ -z "$PLATFORM" ]; then +@@ -2883,7 +2883,7 @@ if [ -z "$PLATFORM" ]; then ULTRIX:*) PLATFORM=ultrix-g++ ;; @@ -80702,475 +80702,3 @@ index b600744..599203d 100755 -- 1.7.10.4 - -From 67da309cbc542e765d2254bd2e2c64a78c7cd35f Mon Sep 17 00:00:00 2001 -From: Yuchen Deng <loaden@gmail.com> -Date: Sun, 19 Aug 2012 15:38:44 +0800 -Subject: [PATCH 16/24] Add -pipe option of win32-g++'s QMAKE_CFLAGS - -cherry-picked from qt5/qtbase commit 2b57a8ebfeb6e3495b63fac619631896ca670f11 - -Change-Id: Idccab648df1a9456a4ee19f1acfdb0544d40a928 -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> -(cherry picked from commit 9fbdb93d3aa1cad8859325814e28f014acd18f10) - -diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index d174634..6d631fc 100644 ---- a/mkspecs/win32-g++/qmake.conf -+++ b/mkspecs/win32-g++/qmake.conf -@@ -25,7 +25,7 @@ QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = byacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -+QMAKE_CFLAGS = -pipe - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -Wextra - QMAKE_CFLAGS_WARN_OFF = -w --- -1.7.10.4 - - -From eeeadca6963f3dedd6ea3626409199f49afa839f Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> -Date: Mon, 10 Sep 2012 12:08:51 +0200 -Subject: [PATCH 17/24] find qdevice.pri even for installed qt builds - -Change-Id: Ife18068974227d70c52e7cb0d06e6136827ac562 -Reviewed-by: Mark Brand <mabrand@mabrand.nl> -(cherry picked from commit ffac77f7de433f67570ff0da9656bce6481be920) - -diff --git a/mkspecs/features/device_config.prf b/mkspecs/features/device_config.prf -index f7aeb07..7da3fe5 100644 ---- a/mkspecs/features/device_config.prf -+++ b/mkspecs/features/device_config.prf -@@ -1,6 +1,6 @@ - # Load generated qdevice.pri - isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE) --isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = . # where to get? -+isEmpty(QT_BUILD_TREE): QT_BUILD_TREE = $$[QT_INSTALL_DATA] - - DEVICE_PRI = $$QT_BUILD_TREE/mkspecs/qdevice.pri - --- -1.7.10.4 - - -From 2519a7dd92f14031c7d11775caa0645384febd87 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Wed, 12 Sep 2012 00:22:28 +0200 -Subject: [PATCH 18/24] Partial Revert "Disable pkg-config, when x-compiling - for mingw" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271. - -Despite what the commit message said, pkg-config previously worked -and was useful, particularly for static Qt. Qt itself even installs -its own .pc files. - -Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid -using the pkg-config installation on the build machine. - -cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e -Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7 -Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> -(cherry picked from commit 57069f1bd5e8cd5450f1d1ceae0d6d315b4a66c8) - -diff --git a/configure b/configure -index 599203d..a0786da 100755 ---- a/configure -+++ b/configure -@@ -1684,7 +1684,6 @@ while [ "$#" -gt 0 ]; do - case `basename "$XPLATFORM"` in win32-g++*) - XPLATFORM_MINGW=yes - CFG_RPATH=no -- PKG_CONFIG=no - CFG_REDUCE_EXPORTS=no - ;; - esac --- -1.7.10.4 - - -From 03f7a56af4020aaead73c9d0de389d32fd4ddb24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net> -Date: Wed, 12 Sep 2012 11:13:44 +0200 -Subject: [PATCH 19/24] When x-compiling on Linux the host tools doesn't have - Windows' executable suffix - -patch not needed for Qt5 - -Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1 -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> -(cherry picked from commit 95c55b8a913fd7aaa23a44f1f9aa568342b25e07) - -diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 6d631fc..2cd2214 100644 ---- a/mkspecs/win32-g++/qmake.conf -+++ b/mkspecs/win32-g++/qmake.conf -@@ -11,6 +11,8 @@ MAKEFILE_GENERATOR = MINGW - - load(device_config) - -+equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe -+ - TEMPLATE = app - CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header - QT += core gui -@@ -101,9 +103,9 @@ QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - QMAKE_CHK_DIR_EXISTS = if not exist - } - --QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe --QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe --QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe -+QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc$${EXE_SUFFIX} -+QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic$${EXE_SUFFIX} -+QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc$${EXE_SUFFIX} - - QMAKE_IDL = midl - QMAKE_LIB = $${CROSS_COMPILE}ar -ru --- -1.7.10.4 - - -From 32415e3cb482c55b16d5953e37865ded1885869d Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Tue, 11 Sep 2012 23:45:02 +0200 -Subject: [PATCH 20/24] smuggle QT_BUILD_TREE to device_config.prf even during - tests - -Otherwise CROSS_COMPILE is not available for config.tests -because qdevice.pri is not found in such configurations as: - -./configure -xplatform win32-g++-4.6 \ - -device-option CROSS_COMPILE=$TARGET \ - -prefix=$PREFIX/$TARGET \ - -prefix-install - -Normally, we don't want to use .qmake.cache during tests, -but we need that mechanism here. - -Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1 -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> -(cherry picked from commit a0c6987dbb139829f9ea61a66cb863b1baa1f183) - -diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test -index f4a7f29..b8f6743 100755 ---- a/config.tests/unix/compile.test -+++ b/config.tests/unix/compile.test -@@ -68,7 +68,8 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 - # Make sure output from possible previous tests is gone - rm -f "$EXE" "${EXE}.exe" - --"$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" -+echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache" -+"$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" - - if [ "$VERBOSE" = "yes" ]; then - $MAKE --- -1.7.10.4 - - -From b0481b3c70c42136df1904de68a8f8fc797591e2 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Sun, 16 Sep 2012 00:12:53 +0200 -Subject: [PATCH 21/24] configure: postpone pkg-config detection until after - qmake is built -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -pkg-config isn't used before qmake is built, so these tests can take -place afterward. - -This is preparation for using qmake to resolve PKG_CONFIG in mkspecs. - -Change-Id: Icedf9ebd80bbac3fe1e5d7eeca358cb0fc9de072 -Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -(cherry picked from commit 1861f0317d4058482667154131f8eb6488db407e) - -diff --git a/configure b/configure -index a0786da..53d0506 100755 ---- a/configure -+++ b/configure -@@ -3330,64 +3330,9 @@ if [ "$OPT_VERBOSE" = "yes" ]; then - fi - - #------------------------------------------------------------------------------- --# write out device config before we run the test. --#------------------------------------------------------------------------------- --DEVICE_VARS_OUTFILE="$outpath/mkspecs/qdevice.pri" --if cmp -s "$DEVICE_VARS_FILE" "$DEVICE_VARS_OUTFILE"; then -- rm -f "$DEVICE_VARS_FILE" --else -- mv -f $DEVICE_VARS_FILE "$DEVICE_VARS_OUTFILE" -- DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE" --fi -- --#------------------------------------------------------------------------------- - # tests that don't need qmake (must be run before displaying help) - #------------------------------------------------------------------------------- - --if [ -z "$PKG_CONFIG" ]; then -- # See if PKG_CONFIG is set in the mkspec: -- PKG_CONFIG=`getXQMakeConf PKG_CONFIG` --fi --if [ -z "$PKG_CONFIG" ]; then -- PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null` --fi -- --# Work out if we can use pkg-config --if [ "$QT_CROSS_COMPILE" = "yes" ]; then -- if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then -- echo >&2 "" -- echo >&2 "You have asked to use pkg-config and are cross-compiling." -- echo >&2 "Please make sure you have a correctly set-up pkg-config" -- echo >&2 "environment!" -- echo >&2 "" -- if [ -z "$PKG_CONFIG_PATH" ]; then -- echo >&2 "" -- echo >&2 "Warning: PKG_CONFIG_PATH has not been set. This could mean" -- echo >&2 "the host compiler's .pc files will be used. This is probably" -- echo >&2 "not what you want." -- echo >&2 "" -- elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then -- echo >&2 "" -- echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not" -- echo >&2 "been set. This means your toolchain's .pc files must contain" -- echo >&2 "the paths to the toolchain's libraries & headers. If configure" -- echo >&2 "tests are failing, please check these files." -- echo >&2 "" -- fi -- else -- echo >&2 "" -- echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling." -- echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for" -- echo >&2 "dependencies" -- echo >&2 "" -- PKG_CONFIG="" -- fi --fi -- --if [ ! -n "$PKG_CONFIG" ]; then -- QT_CONFIG="$QT_CONFIG no-pkg-config" --fi -- - # process CFG_MAC_ARCHS - if [ "$PLATFORM_MAC" = "yes" ]; then - # check -arch arguments for validity. -@@ -5058,6 +5003,61 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; - fi # Build qmake - - #------------------------------------------------------------------------------- -+# write out device config before we run the test. -+#------------------------------------------------------------------------------- -+DEVICE_VARS_OUTFILE="$outpath/mkspecs/qdevice.pri" -+if cmp -s "$DEVICE_VARS_FILE" "$DEVICE_VARS_OUTFILE"; then -+ rm -f "$DEVICE_VARS_FILE" -+else -+ mv -f $DEVICE_VARS_FILE "$DEVICE_VARS_OUTFILE" -+ DEVICE_VARS_FILE="$DEVICE_VARS_OUTFILE" -+fi -+ -+if [ -z "$PKG_CONFIG" ]; then -+ # See if PKG_CONFIG is set in the mkspec: -+ PKG_CONFIG=`getXQMakeConf PKG_CONFIG` -+fi -+if [ -z "$PKG_CONFIG" ]; then -+ PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null` -+fi -+ -+# Work out if we can use pkg-config -+if [ "$QT_CROSS_COMPILE" = "yes" ]; then -+ if [ "$QT_FORCE_PKGCONFIG" = "yes" ]; then -+ echo >&2 "" -+ echo >&2 "You have asked to use pkg-config and are cross-compiling." -+ echo >&2 "Please make sure you have a correctly set-up pkg-config" -+ echo >&2 "environment!" -+ echo >&2 "" -+ if [ -z "$PKG_CONFIG_PATH" ]; then -+ echo >&2 "" -+ echo >&2 "Warning: PKG_CONFIG_PATH has not been set. This could mean" -+ echo >&2 "the host compiler's .pc files will be used. This is probably" -+ echo >&2 "not what you want." -+ echo >&2 "" -+ elif [ -z "$PKG_CONFIG_SYSROOT" ] && [ -z "$PKG_CONFIG_SYSROOT_DIR" ]; then -+ echo >&2 "" -+ echo >&2 "Warning: PKG_CONFIG_SYSROOT/PKG_CONFIG_SYSROOT_DIR has not" -+ echo >&2 "been set. This means your toolchain's .pc files must contain" -+ echo >&2 "the paths to the toolchain's libraries & headers. If configure" -+ echo >&2 "tests are failing, please check these files." -+ echo >&2 "" -+ fi -+ else -+ echo >&2 "" -+ echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling." -+ echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for" -+ echo >&2 "dependencies" -+ echo >&2 "" -+ PKG_CONFIG="" -+ fi -+fi -+ -+if [ ! -n "$PKG_CONFIG" ]; then -+ QT_CONFIG="$QT_CONFIG no-pkg-config" -+fi -+ -+#------------------------------------------------------------------------------- - # tests that need qmake - #------------------------------------------------------------------------------- - --- -1.7.10.4 - - -From b0638daae7481b9770e4a88bb7509f6cbbfee0e8 Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Fri, 14 Sep 2012 10:03:18 +0200 -Subject: [PATCH 22/24] use qmake to get PKG_CONFIG in configure script - -The value of PKG_CONFIG might depend on device options. -For example, "-device-option PKG_CONFIG" might be used with configure -or a mkspec might prefix PKG_CONFIG with CROSS_COMPILE which is -specified as a device option. - -The shell functions of configure for parsing mkspecs do not take -device options into account, but qmake is pretty good at it now. - -backport of qt5/qtbase 01864d4854557d2cf8b067e229d77cd7c9c553ee - -Change-Id: I1c9558e550c48e8441ebdac34b82066473c2ce3a -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> -(cherry picked from commit d8f1f7a29c277c9a643fd048b87f530e37773676) - -diff --git a/configure b/configure -index 53d0506..723502e 100755 ---- a/configure -+++ b/configure -@@ -5014,8 +5014,12 @@ else - fi - - if [ -z "$PKG_CONFIG" ]; then -- # See if PKG_CONFIG is set in the mkspec: -- PKG_CONFIG=`getXQMakeConf PKG_CONFIG` -+ # See if PKG_CONFIG is set in the mkspec or device options -+ (echo TEMPLATE = subdirs -+ echo 'message($$PKG_CONFIG)') > "$outpath/dummy.pro" -+ echo "QT_BUILD_TREE = $outpath" > "$outpath/.qmake.cache.pkgconfig" -+ PKG_CONFIG=`"$outpath/bin/qmake" -cache "$outpath/.qmake.cache.pkgconfig" -spec "$XQMAKESPEC" "$outpath/dummy.pro" -o /dev/null 2>&1 > /dev/null | sed -n -e 's,Project MESSAGE: \(.*\),\1,p'` -+ rm "$outpath/.qmake.cache.pkgconfig" "$outpath/dummy.pro" - fi - if [ -z "$PKG_CONFIG" ]; then - PKG_CONFIG=`"$WHICH" pkg-config 2>/dev/null` --- -1.7.10.4 - - -From 4814e4ff8a6d245eff8761113ac2ae8f37abf71a Mon Sep 17 00:00:00 2001 -From: Richard Moore <rich@kde.org> -Date: Fri, 14 Sep 2012 00:13:08 +0100 -Subject: [PATCH 23/24] Disable SSL compression by default. - -Disable SSL compression by default since this appears to be the a likely -cause of the currently hyped CRIME attack. - -This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74 - -Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a -Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> -Reviewed-by: Peter Hartmann <phartmann@rim.com> -(cherry picked from commit d41dc3e101a694dec98d7bbb582d428d209e5401) - -diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp -index 49e086f..9578178 100644 ---- a/src/network/ssl/qssl.cpp -+++ b/src/network/ssl/qssl.cpp -@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE - - By default, SslOptionDisableEmptyFragments is turned on since this causes - problems with a large number of servers. SslOptionDisableLegacyRenegotiation -- is also turned on, since it introduces a security risk. The other options -- are turned off. -+ is also turned on, since it introduces a security risk. -+ SslOptionDisableCompression is turned on to prevent the attack publicised by -+ CRIME. The other options are turned off. - - Note: Availability of above options depends on the version of the SSL - backend in use. -diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp -index 24c7b77..3a05f54 100644 ---- a/src/network/ssl/qsslconfiguration.cpp -+++ b/src/network/ssl/qsslconfiguration.cpp -@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const - d->privateKey.isNull() && - d->peerCertificate.isNull() && - d->peerCertificateChain.count() == 0 && -- d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)); -+ d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments -+ |QSsl::SslOptionDisableLegacyRenegotiation -+ |QSsl::SslOptionDisableCompression)); - } - - /*! -diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h -index 74f17cd..c36b651 100644 ---- a/src/network/ssl/qsslconfiguration_p.h -+++ b/src/network/ssl/qsslconfiguration_p.h -@@ -83,7 +83,9 @@ public: - : protocol(QSsl::SecureProtocols), - peerVerifyMode(QSslSocket::AutoVerifyPeer), - peerVerifyDepth(0), -- sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation) -+ sslOptions(QSsl::SslOptionDisableEmptyFragments -+ |QSsl::SslOptionDisableLegacyRenegotiation -+ |QSsl::SslOptionDisableCompression) - { } - - QSslCertificate peerCertificate; --- -1.7.10.4 - - -From 08f8d25243a021fb17bfce06cd2b1f96dea7454d Mon Sep 17 00:00:00 2001 -From: Mark Brand <mabrand@mabrand.nl> -Date: Tue, 18 Sep 2012 21:40:22 +0200 -Subject: [PATCH 24/24] configure: mac features don't belong on cross mingw - target - -CFG_MAC_DWARF2 and CFG_MAC_XARCH options are for targetting macs, not -bulding on them. - -qt5/qtbase commit 7a67c822e3e552d0d881f0409a5316de07dbb8c7 -removed CFG_MAC_DWARF2. - -qt5/qtbase commit 59d5c26075724a581ed276d62d884b44d2ca4489 -removed CFG_MAC_XARCH. - -Change-Id: Idb789ed9a8aa9b824a4c2191a9c39e741ca49574 - -diff --git a/configure b/configure -index 723502e..0978939 100755 ---- a/configure -+++ b/configure -@@ -3421,6 +3421,11 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; - CFG_PRECOMPILE=no - fi - -+if [ "$XPLATFORM_MINGW" = "yes" ]; then -+ CFG_MAC_DWARF2=no -+ CFG_MAC_XARCH=no -+fi -+ - #auto-detect DWARF2 on the mac - if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then - if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then --- -1.7.10.4 - @@ -3,7 +3,7 @@ PKG := qt $(PKG)_IGNORE := -$(PKG)_CHECKSUM := bc352a283610e0cd2fe0dbedbc45613844090fcb +$(PKG)_CHECKSUM := f5880f11c139d7d8d01ecb8d874535f7d9553198 $(PKG)_SUBDIR := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-everywhere-opensource-src-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://releases.qt-project.org/qt4/source/$($(PKG)_FILE) |