summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Fix mmap usage.Jędrzej Nowacki2012-10-311-2/+2
| | | | | | | | | | Add missing MAP_NORESERVE and fix error checking. Special thanks to Olivier JG for debugging the issue. Task-number: QTBUG-27322 Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-292-3/+0
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-292-45/+47
| | | | | | | | 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>
* Fix MinGW-w64 compilationJonathan Liu2012-09-141-1/+1
| | | | | | | | | ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not available with MinGW-w64. Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4 (cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065) Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* QNX: Do not initially commit all memory used in RegisterFileThomas McGuire2012-09-132-4/+39
| | | | | | | | | | | | | | This reduces memory consumption of an application quite a bit. This is a backport of 3958828af8ee5cc046c664d8d8e483314eac06cb from qtjsbackend. At the same time, it is a backport of upstream commit http://trac.webkit.org/changeset/111234, although the patch is quite different as upstream and Qt's JSC have diverged a lot. Change-Id: Ia76359ae614ddd4aeda9c7c7b012e5809b50074d Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Fix patch to WebKit git repoSimon Hausmann2012-08-251-1/+1
| | | | | Change-Id: Ibb5165f3f4ac4aca23cf28a504b8ef7179b018b1 Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
* Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)Kent Hansen2012-08-088-39/+84
| | | | | | | | | | | Cherry-picked from webkit commit a5b3261a8c4386b4e14ce40a34c7fc933a5f7001 Task-number: QTBUG-23871 Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> (cherry picked from commit 79ebd39d0d4846cb911ae122d2059e5add568d7e in qtscript) Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Check that property descriptor members are valid before using themKent Hansen2012-08-031-2/+2
| | | | | | | | | | | | | | | | | | | | Even if getPropertyDescriptor() returns true, it's not guaranteed that PropertyDescriptor::setter() or PropertyDescriptor::value() returns a valid JSC value. This code is in an "#ifdef QT_BUILD_SCRIPT_LIB" block, i.e. a patch we added on top of the original JSC sources. The lack of checks caused the getter-in-prototype and indexed-accessors tests from the V8 test suite to assert in debug mode. Cherry-picked from qt5/qtscript commit db17c14cace450e20745839014075c0263f8618f Task-number: QTBUG-17915 Change-Id: I55db26cfe4b63363be92a0b75f2c69b878ea9ef3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Updated WebKit to 9c682c404770cfb2eddf705be593824e06f8ec40Simon Hausmann2012-07-305-2/+11
| | | | | | | | | Prospective build fix for Mac OS X Mountain Lion Change-Id: Ia6e83bba30788cd473bd01f7217e6153970f60be Reviewed-by: Mike McQuaid <mike@mikemcquaid.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated WebKit to 0b63152ae5d572c4a817a53210d8907f3dd11bd7Simon Hausmann2012-06-257-995/+1089
| | | | | | | | | | Fresh import from qtwebkit-2.2 branch that includes -Werror fix The bison changes are due to a local bison upgrade. Change-Id: I61a413a5550c748c56b39362e2a0f67c321afb4d Task: QTBUG-23987 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Updated WebKit to 2dea2a19feedc165596b933fe9509ddd0caf4d15Simon Hausmann2012-06-2512-277/+29
| | | | | | | Includes version bump and backport of build fix with newer glib versions Change-Id: I42a7c6c835b3d7ae6e79f30f308b350b67dd1e7b Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Enable some SQLITE extensions on BB by defaultRafael Roquetto2012-05-161-0/+1
| | | | | | | | | | | | | Enable SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE by default on Blackberry platforms. These options are already enabled in Ubuntu, Nokia N9 and in some mobile devices. backport of qt5 ee69c935c0f7b4ad3747e369fc18373d31e2521b Change-Id: I0c5065df87e5e5e4c747780d193fa49c213454f1 Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Symbian: fix AlignedBlockAllocator initialization on emulatorPasi Pentikainen2012-05-081-1/+1
| | | | | | | | | | | | | Correction to assert in AlignedBlockAllocator contructor. It had a typo, leading to assert against uninitialized data, which succeeded in all other environments, except in emulator urel version (which zeroes heap allocations). Task-number: ou1cimx1#998546 Change-Id: I9b8a76f1871287263483cfe09b1e962570f9990d Reviewed-by: Pauli Järvinen <ext-pauli.p.jarvinen@nokia.com> Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Updated WebKit to a096458b01a9387719308c99e5917a7b42196078Simon Hausmann2012-05-034-7/+33
| | | | | | | | | | QNX fixes for https://bugs.webkit.org/show_bug.cgi?id=77013 and http://trac.webkit.org/changeset/109105 backported by Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> Change-Id: I4b57f26bac6ed61a8a48ea6ef4c2dedf0503675b Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Reduce virtual address space use by JavaScriptCore on SymbianMurray Read2012-04-204-40/+88
| | | | | | | | | | | | | | | | | JavaScriptCore is reserving 128MB address space for each instance of JSGlobalData that is created in an app. Eg there is one per QDeclarativeView, via QDeclarativeEngine, via QScriptEngine. This can contribute to the app running out of address space and then crashing. The AlignedBlockAllocator is modified to be a process singleton so that all JSGlobalData objects share the same instance. Now there is only one 128MB address space reservation. Task-number: ou1cimx1#993804 Change-Id: I9e8702810541905d5e9be197a5f6a9fe8e9bd0c5 Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* gcc 4.7.0 compatibility fix for javascriptMark Brand2012-04-122-2/+2
| | | | | | | | taken from http://qt-project.org/forums/viewthread/15071 Change-Id: I701fb5a8d754afe9fcd6b327d779365673e07b5d Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-125-10/+39
| | | | | | | | | | | | This is the collection of those earlier patches to libpng in Qt that are still relevant, updated as required: d6ba0e805fd2b17e2e0cbbce32e218551505d91f 91bf025444f13eb269ece6bb430a841638bb32a8 125dae45c5c8e09a58409095f6661ab65ea1e71f d6947bcbed97889d7d56d400f81eb1691a3f18e1 Change-Id: I06603041b5971ade4742f600dbea4cca98ff95a5 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Upgrading libpng: Adding clean copy of libpng 1.5.10aavit2012-04-1242-23675/+3990
| | | | | | | | | | | | | | This commit removes the previous version of the bundled libpng (1.5.4), as well as all local modifications to it. It adds an unmodified copy of the official libpng source distribution, except that various extraneous files have been removed, as usual. The patches required to build it in Qt will follow in separate commit(s). Change-Id: I0cfc782a1c1b7f06b92eb1b38992bd8a0e6de08d Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Updated WebKit to 9c745c625c6d1112cec51d742ecc8c041cc090d7Simon Hausmann2012-04-044-3/+15
| | | | | | | Backport Casper's doc fix from https://bugs.webkit.org/show_bug.cgi?id=82893 Change-Id: I85bd671132fe6e1bb8798960ef0db7f02e10b4b4 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Updated WebKit to c0107296d95cf4f2e988513db42572976ff7d55eSimon Hausmann2012-03-265-79/+95
| | | | | | | Includes windows fix and fixes the shared library version. Change-Id: Ia4b66661323cc4176bdfdf700aa072e9670b3bd2 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Fixed MSVC2011 buildEugene Shcherbina2012-03-198-22/+20
| | | | | | | | | | | | | | | | | It consists of 2 fixes: 1. JavaScriptCore fix is relevant to changed ctor of the std::pair in C++11. Due to that change some code has been broken. Fix makes using std::pair compliant to both standards 2. Clucene is broken in MVS2011 due to changed stdext::hash_map which is used as the ancestor in inner CLucene classes. It ended up with names collision and double inheritance from the one base class. Fix reflects that change. Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Kervala <kervala@gmail.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* WEC7 build fix - use ptrdiff_t from std namespace.Janne Anttila2012-03-141-1/+1
| | | | | | | | | | | WEC7 does not have ptrdiff_t outside std namespace, switched to use ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in operator[]. Task-number: QTBUG-22502 Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Harfbuzz-thai - fix buffer overflow when setting item attributesJohn Tapsell2012-03-141-2/+7
| | | | | Change-Id: I19eeb4ec25a7c6cb3f584e6290169f9f327b8713 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Harfbuzz GPOS hinting- do not consider a subtable to be invalid if it is ↵John Tapsell2012-03-121-0/+3
| | | | | | | | | | | | just empty Considering a subtable to be invalid when it was empty meant that it returned an error causing all further hinting to be aborted. This means that we get no hinting in certain cases with certain fonts. Change-Id: I840c016dc85935b4f2c4373c66a79b4bd8b3a30d Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Harfbuzz-shaper - fix incorrect logClusters being set in HB_OpenTypePositionJohn Tapsell2012-03-041-13/+35
| | | | | | | | | | | | | | After shaping in HB_OpenTypePosition, when we come to calculate the new logClusters array we have to take into account that the glyphs passed in are not a 1 to 1 correspondance with the original string, because some shaping might have already been done. So we must use the old logClusters values (stored in tmpLogClusters) to map from the glyphs passed in back to the original string. This fixes visual word wrapping problems in thai Change-Id: I384dfa98f0946e9e074728f89542acb2b6b6bc27 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix for Thai characters with a below markMarko Kenttala2012-02-282-1/+7
| | | | | | | | | | | Some Thai characters with a mark below got drawn under fonts descent causing them to be clipped in some situations. Added checking for this and use of lower offset if needed. Task-Number: ou1cimx1#979179 Change-Id: If9fb643d4dee24342215a637c805d52b78584333 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix static build of Qt for WinCE and WEC7.Janne Anttila2012-02-271-0/+1
| | | | | | | | | | | | | | | | | When doing a static build of Qt for WinCE/WEC7, the sqlite database driver is statically built into Qt library. In that case relevant HAVE_LOCALTIME_S=0 defined in sqlite.pro under plugins folder does not have effect because qsql_sqlite.pri and further 3rdparty/sqlite.pri are directly included to QtSql library. Moved the needed define down to such *.pri file which is included in both static and non-static Qt builds. Task-number: QTBUG-24500 Change-Id: Iacbdd6d02fc31558a1ce91f42756eaac5053414b Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixed zlib build for WEC7.Andreas Holzammer2012-02-272-10/+7
| | | | | | | | | | | | | | | | | errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qfunctions_wince.h are included. To use this header qglobal.h is needed. In qfunctions_wince.h a special define section is added for zlib. Task-number: QTBUG-22507 Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit 10830e844683c75d96c024450b4b7a624d8d6d8f) Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Updated WebKit to c1252be57a3f673277c732c0902568111b2f4964Simon Hausmann2012-02-238-7/+32
| | | | | | | QNX build fix. Change-Id: I72b31faba88a569f62667f7803f6c7434ce6b15e Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Harfbuzz-thai: Hide ZWJ and ZWNJ characters and show Inherited charactersJohn Tapsell2012-02-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | Thai is not supposed to have ZWJ and ZWNJ characters or any other of the Inherited Unicode Scripts (http://www.verisigninc.com/assets/idn-inherited-unicode-script.pdf) - they don't have a mapping to the thai encoding tis620 which libthai requires. However it is an unfortunate fact that there are many websites etc that liberally place these ZWJ and ZWNJ characters throughout thai text to force word boundaries, so we must also deal with them. We deal with all Inherited characters by mapping them to the invalid code ~0 in tis620 encoding, following what libthai does internally in its own tis620 encoding functions, and then replacing this character with the original unicode and setting dontPrint to true to hide the ZWJ and ZWNJ characters. Includes a unit test to check the behaviour. Change-Id: I49e44da6e39443daa832e7f50c94804e13deabb4 Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Harfbuzz-thai - When calling HB_OpenTypePosition we must set doLogClusters ↵John Tapsell2012-02-101-1/+1
| | | | | | | | | | to true for thai This bug resulted in word wrapping not working correctly for thai. Change-Id: I676deb12258beb224736414712a32e23513f406e Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Harfbuzz-thai - fix to_tis620 function for latin charactersJohn Tapsell2012-02-091-1/+1
| | | | | | | | | This was an obvious typo - a missing "else" in a group of if statements. Change-Id: Iaa58e761ebdff86d4e0bc19113162f380a311f63 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix height of some Thai charactersMarko Kenttala2012-02-071-0/+28
| | | | | | | | | | | | | | Some Thai characters with two above glyphs were higher than fonts ascent. This caused them to be clipped in for example qtcomponents buttons. Added checking for this and calculation of new lower offset between glyphs if needed. Task-Number: ou1cimx1#898104 Change-Id: I6eff058cbe5fe92a01ac1ad10ee351fe8ed78e67 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Sami Merilä <sami.merila@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* JSCore build fix for WEC7jaanttil2012-02-061-0/+11
| | | | | | | | | | WEC7 does not have std::ptrdiff_t type and std::min/std::max, introduced the missing types and functions in JSCore platform.h Task-number: QTBUG-22497 Change-Id: I0bf2bff2a80bdff36253f233b30cc95e1c772e23 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixes to JSCore for WinCE.jaanttil2012-02-061-9/+9
| | | | | | | | | | Moved WINCE specific code before desktop windows code. This is needed because in WinCE both OS(WINCE) and OS(WINDOWS) are true. Task-number: QTBUG-22502 Change-Id: Icf9ad1a155dc705e37e5e057bb23bc7f5c2d4931 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Fixed libjpeg compiler warning about macro redefinition.jaanttil2012-02-011-1/+1
| | | | | | | | | | When compiling Qt for Windows CE the MSVC reported the followin warning: warning C4005: '_CRT_SECURE_NO_DEPRECATE' : macro redefinition Fixed by adding ifdef quard for duplicate _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I8c37ffe6ca275c80a7b7e6b23f39f3ab06b332f1 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed MSVC compiler warning for zlib when compiling on WEC7.jaanttil2012-02-011-2/+6
| | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard to zlib when defining _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4 Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed compiler warning for libpng when compiling for WEC7.jaanttil2012-02-011-1/+3
| | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. libpng redefined the same macro without checking if it is already defined. Added #ifdef guard for libpng '_CRT_SECURE_NO_DEPRECATE' macro definition. Task-number: QTBUG-22512 Change-Id: I41a7a0500b0f44984f35e4d7d6be9adb02c12b33 Reviewed-by: aavit <qt_aavit@ovi.com>
* libpng config for WEC7jaanttil2012-01-311-0/+2
| | | | | | | | | | WEC7 is missing some time conversion related functions -> configured libpng for WinCE accordingly. Task-number: QTBUG-22506 Change-Id: I209b143604bd70368cff7f811b33db8f00d18ed4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixed sqlite for Windows CE.Janne Anttila2012-01-301-13/+10
| | | | | | | | | | | | | Windows CE does not declare the localtime function, for this reason sqlite3.c defines it for Windows CE. However the localtime define was too late in sqlite.c code since the osLocaltime function introduced inside ifndef SQLITE_OMIT_LOCALTIME needs it also. Task-number: QTBUG-22508 Change-Id: I97b9bc6316809178cbcf7e304c5dcd7deb9005cb Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com> (cherry picked from commit 1135aeb1d89b802ab3e3b7cc2c32122e9b91770f)
* Various Qt documentation bug fixes (wk 42)artoka2012-01-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-18101 Task-number: QTBUG-8673 Task-number: QTBUG-14194 Task-number: QTBUG-9109 Task-number: QTBUG-9466 Task-number: QTBUG-8323 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-21295 Task-number: QTBUG-14554 Task-number: QTBUG-8331 Task-number: QTBUG-8329 Task-number: QTBUG-8786 Task-number: QTBUG-8787 Change-Id: I4b6403df4a0078fa385abbfab5b6c3a94f175295 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fixes Javascript WTF to build with BB NDK.Rafael Roquetto2012-01-272-2/+10
| | | | | | | Change-Id: I89d72b2b1c166b826d4367bcb1384c2c5263d5f4 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
* Fix isolated Thai SARA AM handlingJiang Jiang2012-01-181-7/+26
| | | | | | | | | | | | | | Since 5e07a3ac58f93bd5e09715d43b58c20950c2befa Thai text layout is handled by libthai to special case of the SARA AM. It didn't handle isolated SARA AM. This patch fixed it and added detailed explaination on the special case. The dotted circle should be shown rather than hidden. Added a test case to verify that with Waree. Change-Id: I4967715627cbe15f5a3e9ab3e3844420ab541aed Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Updated WebKit to 7b7ded42f42a558bc5672c2523f9c5689bb975d0Zeno Albisser2012-01-063-4/+4
|
* Fix crash when creating a QScriptEngine in a native threadSimon Hausmann2012-01-051-1/+2
| | | | | | | | | | | | | | | The change in http://trac.webkit.org/changeset/48412/ introduced a fix to avoid leaking thread specific data by ensuring get() on ThreadSpecific works even during the thread destruction phase. The fix worked by setting the local data again. However as we can see in the backtrace from QTBUG-22926, the local data should not be set unconditionally, otherwise our destroy function will be called recursively when the local data is still set. Task-number: QTBUG-22926 Reviewed-by: Kent Hansen Tested-and-Reviewed-by: Andy Shaw
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-12-087-6/+23
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18
| * Updated WebKit to 83439de78841f9569ad78e3a84b7b888337b5d18Zeno Albisser2011-12-087-6/+23
| |
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-12-073-40/+352
|\ \ | | | | | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp
| * | Fix HarfBuzz Thai character SARA AM handlingJiang Jiang2011-11-303-40/+352
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is contributed by Thanomsub Noppaburana from libthai. It added a special thai shaping function to handle SARA AM character for fonts without OpenType rules to support it, like Nokia Pure Text AS. With modification to logClusters assignment to make sure that QTextLine::glyphRuns(int from, int length) returns correct glyphs. Task-number: QTBUG-21206 Change-Id: I5a78ee1ab2b4c874c7d0df17d4ee6d264ed5a790 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Fixes: the png_handle_cHRM crash bug in bundled libpng 1.5.4aavit2011-10-191-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The PNG Development Group explains that libpng 1.5.4 (only) introduced a divide-by-zero bug in png_handle_cHRM(), which could lead to crashes (denial of service) for certain malformed PNGs. Ref. http://www.libpng.org/pub/png/libpng.html Task-number: QTBUG-22168
generated by cgit v0.12 at 2024-10-30 09:27:17 (GMT)