summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs
Commit message (Collapse)AuthorAgeFilesLines
* Updated year in copyright headerKai Koehne2014-03-2621-21/+21
| | | | | | | | | | | | | | | | | | find . -path '*/3rdparty/*' -prune -o -type f -print | xargs -L1 sed -i -E 's/Copyright(.*) 2013 Digia/Copyright\1 2014 Digia/g' Manually patched files: demos/spectrum/3rdparty/fftreal/fftreal_wrapper.h demos/spectrum/3rdparty/fftreal/fftreal_wrapper.cpp src/3rdparty/s60/eiksoftkeyimage.h tools/qdoc3/test/qt-project.qdocconf tests/auto/qsharedpointer/nontracked.h tests/auto/qsharedpointer/nontracked.cpp Change-Id: I3f9074923b4d6bd4666258ab04f01476cc6e901c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1321-21/+21
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* x-compile with mingw: fix codec linker errorsPeter Kümmel2012-11-031-4/+4
| | | | | | | | | | | | Don't build codecs into Core when plugins are used. Qt5 doesn't use plugins for the codecs any more and they are part of Core. This change was considered too drastic for Qt 4.8, so no backport is possible. Task-number: QTBUG-27618 Change-Id: I01347645cedc6f4ecaf3158ea8336b0672ac9a46 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2921-494/+494
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-0121-42/+42
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix scopes on iconv related pro/pri filesRafael Roquetto2012-03-281-1/+1
| | | | | | | | | | | | Ensure corelib and the iconv configure test link against libiconv on QNX-based platforms. This now includes the Blackberry mkspecs which were previously excluded. cherry-picked from qt5/qtbase: b0b36cc53c6115e5ca30986ceaf01215d09fcb39 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Iee5758d3b31e3827e69a1598a5794b3d5ba25b03 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Crash in Symbian text codec creation without CleanupStackMurray Read2012-03-151-1/+5
| | | | | | | | | | | | | | The Symbian text codec is creating a CCnvCharacterSetConverter with its NewL() function. This requires the CleanupStack, otherwise you get a E32USER-CBase 69 panic. But sometimes apps have been using text streams and other objects in static data construction or destruction which use the text codec where there is no CleanupStack. This change detects is a CleanupStack is present and temporarily creates one if not. Change-Id: Ia68fa60b4f0e3d675ee302208a625c6e9493a6f1 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fixes potential memory leak in qtextcodec.cppNick Ratelle2012-03-141-17/+9
| | | | | | | | cherry-picked from qt5/qtbase 4560ea230f40 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Change-Id: I06fc265fcc34bcc671c44b7041c0c461e588d193 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixes mismatching delete operatorRafael Roquetto2012-03-111-1/+1
| | | | | | | | cherry-picked from qt5/qtbase 657f634c0e8a1bf4f544b Change-Id: I35cbdd6fa947a98a6afa70bdc72631c4213c288a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixed wrong iconv_open call under QNXRafael Roquetto2012-03-111-1/+1
| | | | | | | | | | | The wrong macro logic was causing iconv_open to never be called under QNX. cherry-picked from qt5/qtbase 8a15c41d36b1905a2 Change-Id: I0a1e3fb01d726daca637f8f51abfc924cd493311 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Fixes codecs.pri to reflect new QNX mkspec nameRafael Roquetto2012-03-091-1/+1
| | | | | | Change-Id: I7d22d48b189e8abfd6164a51b1e025360ef3da5a Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fixes QIconvCodec::convertToUnicode()Nick Ratelle2012-02-072-1/+6
| | | | | | | | | | | | We need to hang onto the internal state of the utf16 converter object whenever converting a long string to unicode. This was failing with the text stream class -- the first read was okay, but subsequent reads could not be correctly converted to unicode. cherry-picked from qt5/qtbase: 72c07311228ce6eefb460d7e5da3de24220ba81e Change-Id: I794d78808ccd9deedcb406bfe46e373c18142d05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add support for QNX iconv implementation.Rafael Roquetto2012-02-032-0/+6
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. cherry-picked from qt5/qtbase 38cba9a37fc5fe76b1549463422ab539a1b4cf24 Change-Id: Ia77633f1ddfdc8f5a8414125f8363749a6449cc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update year in Nokia copyright messages.Jason McDonald2012-01-1121-21/+21
| | | | | | | | | Simple search and replace. This commit doesn't touch 3rd-party files, nor translations (where the change is not so simple and will be handled in a separate commit). Change-Id: I4e48513b8078a44a8cd272326685b25338890148 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-071-4/+4
| | | | | Merge-request: 1284 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-171-4/+5
|\
| * don't crash when destroying codec listOswald Buddenhagen2011-08-151-4/+5
| | | | | | | | this was uncovered by rittk's don't-detach patch.
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-051-1/+3
|\ \ | |/
| * Adding "hkscs_2004" to the codec alias tableAlessandro Portale2011-07-041-0/+1
| | | | | | | | | | Task-Number: QTBUG-19024 Reviewed-by: Olivier Goffart
| * Adding Kazakh entry to the codec alias tableAlessandro Portale2011-07-041-1/+2
| | | | | | | | | | | | | | A Symbian update after "Anna" may come with Kazakh support. Task-number: QTBUG-19024 Reviewed-by: Olivier Goffart
| * Update licenseheader text in source filesJyri Tahtela2011-05-1321-350/+350
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-1321-350/+350
| | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | Make the QIconvCodec on Unix not enforce the Latin1 codec.Thiago Macieira2011-03-291-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, the QIconvCodec created and disposed of the iconv_t structure at every turn. In Qt 4.5, we started saving it for later in a thread-local storage. We had to introduce a fix to make sure that we didn't create the iconv_t structure before the setlocale(LC_ALL, "") call was made, though: otherwise, we'd keep forever an iconv_t that pointed to the wrong encoding. So now simply restore the Qt 4.4 behaviour: create and dispose of the iconv_t structure if we're called before the QCoreApplication constructor is run or after the static destructors are run. Note: this means QIconvCodec will probably default to US-ASCII when run before QCoreApplication, not Latin 1. Non-ASCII characters (anything with the high bit set) will fail to convert. Task-number: QTBUG-15229? Reviewed-by: Denis Dzyubenko
* | Various INTEGRITY fixesRolland Dudemaine2011-02-221-3/+3
|/ | | | | | | | Some smaller adaptation for missing POSIX calls and some build system tweaks for the INTEGRITY RTOS Merge-request: 1101 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* QTextCodec::codecForMib: actually use the cacheOlivier Goffart2011-01-111-1/+4
| | | | | | Was removed by mistake in commit 02aecce59cb76ceb88f635203553 Reviewed-by: Peter Hartmann
* Update copyright year to 2011.Jason McDonald2011-01-1021-21/+21
| | | | Reviewed-by: Trust Me
* Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
|
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-041-24/+28
|\
| * QTextCodec: Fix valgrind warning when using QTextCodec in destructions ↵Olivier Goffart2010-09-291-24/+28
| | | | | | | | | | | | functions Reviewed-by: Denis
* | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-041-5/+5
|/ | | | | | In the repository, we should always use the No Commercial license alongside the GNU Free Documentation License for documentation files.
* qtextcodec_symbian: Add few aliasesOlivier Goffart2010-09-201-2/+2
| | | | Reviewed-by: Denis
* Remove unnecessary textcodec aliases from qtextcodec_symbian.cppAlessandro Portale2010-09-171-2/+2
| | | | | | | | | | | MS_KANJI and Java UTF-8 are not needed because both had aliases which only differ in character case. Qt handles these aliases case insensitive, however. The removal speeds the lookup up, a bit. Reviewed-By: Olivier Goffart Task-Number: QTBUG-13565
* Removing embarrassing trialing white spaces from former commitAlessandro Portale2010-09-161-6/+6
| | | | Hereby, I outed myself to have used Carbide.c++
* Maintaining codecsData in qtextcodec_symbian.cppAlessandro Portale2010-09-151-3/+12
| | | | | | | | | | | | | | Adding portuguese_gsm7_single, portuguese_locking_gsm7ext, portuguese_locking_single, spanish_gsm7_single and GB18030. This should reduce the amount of expensive calls to CCnvCharacterSetConverter:: ConvertCharacterSetIdentifierToStandardNameL() Also adding an alias "Java UTF-8" to the existing "JAVA UTF-8" since that is what the function with long name would return. Task-Number: QTBUG-13565 Reviewed-By: Olivier Goffart
* QTextCodec: fix wodring of a commentOlivier Goffart2010-08-191-2/+4
|
* Use built-in iconv on Solaris if availablePierre Rossi2010-06-301-0/+4
| | | | | Task-number: QTBUG-1853 Reviewed-by: Thiago
* Doc: Relicensed the documentation under the GNU FDL version 1.3.David Boddie2010-06-211-25/+11
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-021-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix project file generation for MSVC 2010 Fix wrong translation and clip for the raster paint-engine on Mac Return the correct library name in qt_gl_library_name for GLES* qmake: remove useless evaluation of variables from VS project generators Fix QT_NO_LIBRARY Documentation for the Elastic Nodes example. qmake: fix duplicate linker options in VS project files Ensured that WA_InputMethodEnabled was set before FocusInEvent was sent. qmake: fix duplicate compiler options in VS project files Documentation for the Drag and Drop Robot example. Fix crash in styles example when running with opengl graphicssystem Fixed the sizehint for cols/rows in qtableview QUrl: parsing of host name with an undercore. Null pointer check Revert "Try to use multisampled opengl graphicssystem on all platforms" A small mistake when comparing the flag. Add unit tests covering most of QVector's API. Fix crash when CoreText fails to shape text for us Fix crash when using opengl graphicssystem on desktop Revert "Revert "Implement heightForWidth support for QTabWidget and QStackedLayout.""
| * Fix QT_NO_LIBRARYTasuku Suzuki2010-04-291-4/+4
| | | | | | | | | | | | | | | | | | Some class uses QFactoryLoader without checking if QT_NO_LIBRARY is not defined. Remove QT_NO_SETTINGS used with QT_NO_LIBRARY for QFactoryLoader because LIBRARY depends on SETTINGS. Merge-request: 578 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-291-11/+11
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | All EGL-related changes from 4.6 were discarded. Conflicts: src/gui/egl/egl.pri src/gui/egl/qegl.cpp src/gui/egl/qegl_p.h src/gui/egl/qegl_stub.cpp src/gui/egl/qeglproperties_p.h src/gui/egl/qeglproperties_stub.cpp src/gui/gui.pro src/multimedia/multimedia/audio/qaudioinput_win32_p.h src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * Fix infinite recursion in QIconvCodec when iconv fails.Thiago Macieira2010-04-261-11/+11
| | | | | | | | | | | | | | | | We mustn't use to/fromAscii because that goes back into the iconv codec... Task-number: QTBUG-10189 Reviewed-by: Olivier Goffart
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-122-2/+42
|\ \ | |/ | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/gui/image/qimage.cpp src/openvg/qwindowsurface_vgegl.cpp
| * econd half of the crash fix for codecs on SymbianLars Knoll2010-04-122-2/+37
| | | | | | | | | | | | | | | | Ensure that we do not try to use any codecs if we don't have a cleanup stack available on Symbian. Task-number: QT-3255 Reviewed-by: Iain
| * Fix a crash with global static objectsLars Knoll2010-04-101-0/+5
| | | | | | | | | | | | | | | | | | When global static objects use text codecs in their constructor or destructor we would crash on symbian, as the symbian codec was trying to use a non existing cleanup stack. Task-number: QT-3255 Reviewed-by: Espen Riskedal
* | remove qt_winQString2MB() and qt_winMB2QString()Oswald Buddenhagen2010-03-111-2/+28
| | | | | | | | | | | | absorb qt_winQString2MB() code directly into the QTextCodec code Acked-by: thiago
* | Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-101-12/+27
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| * | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-081-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-071-12/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| | * | Make the UTF-8 encoder/decoder not accept Unicode non-charactersThiago Macieira2010-03-051-3/+25
| | | | | | | | | | | | | | | | Reviewed-By: Denis Dzyubenko
| | * | Finish reverting the UTF-8 hack added in 80ea01c6 (P4 106704, Qt 3.2).Thiago Macieira2010-03-051-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was removed from QString in 539cd1e5 (P4 259474, Qt 4.3), but apparently lingered on the UTF-8 codec code. Reviewed-by: Denis Dzyubenko
generated by cgit v0.12 at 2025-04-07 08:16:41 (GMT)