summaryrefslogtreecommitdiff
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Update obsolete external URLsTopi Reinio2015-04-111-1/+1
| | | | | | | | Update external URLs in the documentation for links where the resource is still available online. Change-Id: I99e5d6d7e030f93c3fe8d31cf300077e2897649e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAkseli Salovaara2015-03-312-25/+25
| | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7e3e96183e073877b46bc8071b2ccae19e69426b Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* fix QWebSettings::setUserStyleSheetUrl() not working with windows pathsAshish Kulkarni2014-12-131-1/+1
| | | | | | | | | | | | | | | QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters. KURL::path() alone does not handle removing the leading slash from a windows file path. Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately This fixes https://bugs.webkit.org/show_bug.cgi?id=34884. Change-Id: I37a1482b67447be6ea6a10966cf59c9159db83cd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix thai symbol rendering slownessKonstantin Ritt2014-11-221-1/+3
| | | | | | | | | | | Harfbuzz is constantly trying to load libthai in src/3rdparty/harfbuzz/src/harfbuzz-thai.c, making rendering of thai symbols very slow. Task-number: QTBUG-37665 Change-Id: I30a2a5489271534eeacc205d8106b22130c40c5f (cherry picked from qtbase/47e6ec0736aa129e181e0b6f02cec884f9832432) Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Parse multiple buttons during mouse press and releaseAllan Sandfeld Jensen2014-11-041-3/+5
| | | | | | | | | Copies the logic for parsing mouse buttons from Qt5 QtWebKit so that button clicks when another button is held works. Task-number: QTBUG-42319 Change-Id: If56e20533531fe949eef444eb7e2f747907f5bcc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix DateTime with recent versions of tzdataAllan Sandfeld Jensen2014-09-2313-244/+218
| | | | | | | | | An backport of http://trac.webkit.org/changeset/150833 needed for correct time KRAT, YAKT and MOS timezones. Task-number: QTBUG-41422 Change-Id: I6e9d1db690fee8d77faa1d76c836bd7b345ce854 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Restore dirty line logic in RenderInline::destroyAshish Kulkarni2014-05-091-1/+2
| | | | | | | | | | In ea0cb7ad2066d9c3dc695ab2ebe724249b05ca0f the webkit version was upgraded which effectively merged http://trac.webkit.org/changeset/85869 The follow up patch was never merged: http://trac.webkit.org/changeset/86060 associated with ​https://bugs.webkit.org/show_bug.cgi?id=60448 Change-Id: I7dff1733439bb3bcfecc767da9147aa09a3159cf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix building of JSC with libc++.Raphael Kubo da Costa2014-04-221-6/+0
| | | | | | | | | | Follow-up to 0de22e8 and 427d50d: the former was not just a cleanup commit, and part of the changes reverted in the latter actually broke the build with libc++ again: clang defines __GNUC__ for compatibility with GCC, but if libc++ is used ext/atomicity.h does not exist. Change-Id: Id86646d38b7bc62dbe0731f8f32efb2353335210 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix compilation of QtWebKit with MSVC 2013Ashish Kulkarni2014-04-171-2/+2
| | | | | | | | | | Starting with MSVC 2013, more functions are provided. Task-number: QTBUG-34705 Change-Id: I85e35a2486e0bd556f5f16e5911cca5c364273ed (adapted from commit qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix compilation of QtWebKit with MSVC 2012/2013Ashish Kulkarni2014-04-171-0/+16
| | | | | | | | | | For some reason, MSVC 2012/2013 is no longer able to infer the need for both a call to a constructor and a cast of its parameter so we have to give a hint for at least one of these two operations. Task-number: QTBUG-31882 Change-Id: I42b54313ec4f6a83cde28326534c59b93ab3f615 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Updated year in copyright headerKai Koehne2014-03-261-1/+1
| | | | | | | | | | | | | | | | | | 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>
* Remove -fuse-ld=gold from webkit's LFLAGSNiels Ole Salscheider2014-03-131-7/+0
| | | | | | | | | | | This flag is not supported by upstream gcc. Thus the build might fail if the gold linker is found. This fixes https://bugs.webkit.org/show_bug.cgi?id=89312. Change-Id: I931081fccf64a43b32f2aaf2c3ad377391fdad4c Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix recursive calling of QScriptProgramLars Knoll2014-03-131-0/+2
| | | | | | | | | | | | | | The first time a QScriptProgram is evaluated, it gets compiled and then executed. If the execution would somehow trigger another evaluation of the script program, it would run into the compile stage again (even though it already was compiled), and then trigger and assertion in debug mode (or leak memory in release builds). Backport of 08d9ef715265d33f4cf04693b0787fd75994dc42 from Qt 5. Task-number: QTBUG-37317 Change-Id: I83e7efd5f238d021e200258826e2e4a9520c3a7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add AArch64 detection support to JavaScriptCore.Dmitry Shachnev2014-03-131-1/+9
| | | | | | | | | Cherry-picked from qtscript commit 2e049836ee16f4aedbe7ccc3335fc5. Change-Id: I8d9fdeceb62f4de4eb9bd74ae45bb33a641ef5cc Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix building of WebKit's JSC for earlier versions of gcc on MacAndy Shaw2014-03-131-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert e3c44790065894f4e7f98ab097fce22c5bcbbd0a partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: Ic662841f53660b763af2bc71cb9b4684fe614063 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix building of JSC for earlier versions of gcc on MacAndy Shaw2014-02-251-0/+14
| | | | | | | | | | Since building for Carbon typically uses older versions of gcc on older versions of Mac, then we need to revert 0de22e80ac645afc3793419300d6271d95809196 partially in order to fix this. Since the original code was just a cleanup then this is safe to do so. Change-Id: I5dd8fe99704ffac66ac3384b62849fa8162ca82d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* WebKit: Remove video support on OS XBrian Jensen2013-12-094-86/+5
| | | | | | | | | | | | | | | | | WebKit video support on OS X currently relies on QTKit to function properly. This is problematic because QTKit video support in WebKit requires linking against the WebKitSystemInterface specific to each OS X release, thus preventing the same set of Qt binaries from interoprating with several Mac Releases. As a workaround video support is disabled. Back ported from: http://trac.webkit.org/changeset/151546 Task-number: QTBUG-32237 Change-Id: I780062ce5971960dcad7b51e6226dcf7cd7c907f Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* qt webkit: add support for MIPS64 platformsVicente Olivert Riera2013-12-061-6/+11
| | | | | | | | | | qt5webkit is not fixed and this patch cannont be applied to qt5webkit Task-number: QTBUG-35394 Change-Id: Ie2d332345741989a0b4ef93306ca36b42e888c11 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* qtscript: Add support for MIPS64 platformsVicente Olivert Riera2013-12-031-1/+23
| | | | | | | | | | | | This fix do not apply to Qt 5 because qtscript has been already patched in 408847dcdfe1d407cd85616e8f595fb5ea25ca46 Task-number: QTBUG-35030 Change-Id: I0eb71aa875afef9eee15a203b9bd24f5395a3463 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: YunQiang Su <wzssyqa@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Correct WebKit build path settingsBenjamin Seppke2013-11-281-2/+2
| | | | | | | | Change the WebKit build path settings to point to the correct install location. Change-Id: Idd350a9d873be454d88a01accf3d9fe590cc0103 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Backported fix for WebKit libc++ support on OS X MavricksBrian Jensen2013-11-282-2/+2
| | | | | | | | | | | | | As of OS X 10.9 Mavericks libc++ is the default standard library implementation. This fix is necessary for building WebKit on OS X Mavericks when using libc++. Upstream Change: http://trac.webkit.org/changeset/107489 Task-number: QTBUG-34652 Change-Id: Ieb30c115b85045adc3e82ee039c541c973b72a3c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* WebKit Nullptr type fixes when using libc++Brian Jensen2013-11-283-10/+10
| | | | | | | | | These changes correct the Nullptr type handling for libc++ based system. Task-number: QTBUG-34652 Change-Id: Ied51c8683cce86beb24ed2fef70e99bb4dfc15e5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix WebKit TimerHeap implementaiton to work with more standard librariesDarin Adler2013-11-282-77/+110
| | | | | | | | | | | | This is necessary to get WebKit to build with more with more STL variants, including libc++. It is based on the upstream WebKit change: http://trac.webkit.org/changeset/92556 Task-number: QTBUG-34652 Change-Id: I31ad9a7af8b1fb21d4186857f63a9fdf58429042 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix compilation of Qt Script with MSVC 2013.Friedemann Kleint2013-10-251-2/+2
| | | | | | | | | Starting with MSVC 2013, more functions are provided. Change-Id: Iabbc9a94e7ed01584baaa1bb17c06e41ac70830f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> (cherry picked from qtscript/24d678ce9c3996f46d1069c2b1193e7ec1083fc8)
* [WK1] NPStream::headers not initializedAllan Sandfeld Jensen2013-08-091-0/+1
| | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119574 Reviewed by Alexey Proskuryakov. Initialize the header field. According to user feedback that should solve some cases of random crashes when loading plugins on Mac and Windows. * plugins/PluginStream.cpp: (WebCore::PluginStream::PluginStream): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153828 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-32181 Change-Id: I45410e618cf0337ac1b2c8c4bafa572e8e1e0d19 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Make libtiff link on OS X 10.9.Jake Petroules2013-08-051-9/+0
| | | | | | | Backport of Ie6f8639fb920e57289c7d0ad8952603abcfe7377. Change-Id: I9d0cd625734fda88a9564d4fef7b1f5e9f22c774 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* [Qt][WK1] navigator.plugins shows too few entries.Michael Brüning2013-08-011-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Backport r153517 from webkit trunk and Qt 5 to Qt 4.8. https://bugs.webkit.org/show_bug.cgi?id=119332 Reviewed by Jocelyn Turcotte. Based on input by Choon Sik Cho. WebPlatformStrategies::getPluginInfo was using the WTF::Vector::resize method wrongly. This patch removes the call to Vector::resize as Vector::append will take care of increasing capacity if needed. * WebCoreSupport/WebPlatformStrategies.cpp: (WebPlatformStrategies::getPluginInfo): Task-Number: QTBUG-30141 Change-Id: Ief250ee98c4c5d2cb5165d6da3d7b43c54cbd7c8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-07-021-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are primarily useful for getting rid of some libstdc++-specific includes which break the build with libc++, and also for simplifying the code and removing a Darwin-specific code path. r139553 by ossy@webkit.org: Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add https://bugs.webkit.org/show_bug.cgi?id=106729 After r139514 we need atomicIncrement(int64_t volatile*) for all platform. Now the GCC implementation of atomicIncrement() is based on gnu_cxx::exchange_and_add, which doesn't support int64_t type, but sync_add_and_fetch does. Reviewed by Benjamin Poulain. r139921 by benjamin@webkit.org: Use GCC's implementation of atomicIncrement/Decrement on Mac https://bugs.webkit.org/show_bug.cgi?id=106976 Reviewed by Filip Pizlo. wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB: sync_add_and_fetch, sync_sub_and_fetch. Using them let the compiler just generate the atomic operations inline instead of generating a function call to LibC. It also simplify the code a bit. Cherry-picked from qtwebkit/0baf197 and qtwebkit/801fc96. I'm cherry-picking both revisions together to match what was done in 0de22e80. Change-Id: Ie5c1067980662ff04e8e36d8cf6e9459b7c46aab Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* QNX: Changing the way JSC retrieves the current stack base pointerFabian Bumberger2013-06-291-34/+2
| | | | | | | | | | | | | | | | What Qt is calling the stackbase is the top of the stack. The thread local storage [__tls()] area is at the top of the stack and the stack pointer is initialized below this on thread creation. With this patch, the stack base pointer can be retrieved faster then in the current implementation. This patch is from Sean Boudreau. Change-Id: I3d1ac58d5c43997cbf462424c66be0c7caafcf1b Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* clucene: Compile with clang's libc++Bradley T. Hughes2013-06-161-0/+8
| | | | | | | | | | | | | | When using clang's libc++, the 'using namespace std;' in CLucene's StdHeader.h causes ambiguity between wcschr() from wchar.h and std::wcschr() from cwchar (which is automatically included by libc++). The only symbols used from the std namespace are std::min() and std::max() so only pull these in, not the whole std namespace. Cherry-picked from qttools/bc35938d0d49b04bf98feda3e85da186ecc8184d. Change-Id: Ife6647df795f59a5feebd5c1aa3eebe7446ec720 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bring in WebKit revisions 139553 and 139921.Raphael Kubo da Costa2013-06-151-16/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are primarily useful for getting rid of some libstdc++-specific includes which break the build with libc++, and also for simplifying the code and removing a Darwin-specific code path. r139553 by ossy@webkit.org: Use sync_add_and_fetch instead of gnu_cxx::exchange_and_add https://bugs.webkit.org/show_bug.cgi?id=106729 After r139514 we need atomicIncrement(int64_t volatile*) for all platform. Now the GCC implementation of atomicIncrement() is based on gnu_cxx::exchange_and_add, which doesn't support int64_t type, but sync_add_and_fetch does. Reviewed by Benjamin Poulain. r139921 by benjamin@webkit.org: Use GCC's implementation of atomicIncrement/Decrement on Mac https://bugs.webkit.org/show_bug.cgi?id=106976 Reviewed by Filip Pizlo. wtf/Atomics.h: GCC and LLVM have builtin for atomic ADD and SUB: sync_add_and_fetch, sync_sub_and_fetch. Using them let the compiler just generate the atomic operations inline instead of generating a function call to LibC. It also simplify the code a bit. Cherry-picked from qtscript/184fc178f4c753727445694c4830c250f53da588. Change-Id: Id785e35944682691725947e0f329668d17ff6903 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Compile with clang's libc++Bradley T. Hughes2013-06-102-2/+4
| | | | | | | | | | | | | | | An overload for std::swap() what works with std::pair<A,B> is included in libc++ (but not libstdc++). Avoid ambiguity in HashTable.h by omitting the version there and using the std::swap() version. Collector.cpp needs to include pthread.h directly, as it is not automatically included by libc++'s headers (libstdc++ does pull in pthread.h though). Cherry-picked from qtscript/48baeef0766ba145d26d374561e152b40245f3b8. Change-Id: I4dc88638ce8553bb97037b841fc6cc5e8c9911e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Correct error in Makefile generation for Windows MinGW.v4.8.5Michael Brüning2013-06-071-1/+1
| | | | | | | | | | | | Remove the build_pass check that was added for vcproj generation as it is no longer deemed necessary. See http://trac.webkit.org/changeset/62264 and http://trac.webkit.org/changeset/59266 for context. Task-number: QTBUG-27413 Change-Id: Ie82032cf4b183b31c66defc2d49cc8095989ec8f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Remove Nokia references.Leonard Lee2013-06-042-5/+1
| | | | | | | | | | These Nokia references removed as they are not appropriate. Task-number: QTBUG-31400 Change-Id: Ib80d2c2d28353e74c46e9ead9cde9807dad7022d (cherry-picked from qtdoc/019f96bc47cf56170c125ae90f5fc00059f6665d) (cherry-picked from qtwebkit/d7b8c69ccdd5547b5660be5876dbdedc3ac29548) Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix Qt WebKit build for non-default Xcode setup / Xcode 4.3+Danny Boelens2013-05-311-4/+4
| | | | | | | | | | There's no need to test the full path, the actual name of the SDK will do. This fixes the build in cases where Xcode is not installed in /Developer or when building with Xcode 4.3 or higher (where Xcode is a bundle), because in those cases the SDK's full path does not start with /Developer. Change-Id: I598ba2a5ebaae813f576dc72102d05fe8804a86f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Bring in WebKit r74029 to fix the build with clang.Raphael Kubo da Costa2013-04-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | ------------------------------------------------------------------------ r74029 | cwzwarich@webkit.org | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Cherry-picked from qtscript/c85662167123b433a69a662212c67ce03e44a25a. Change-Id: I21ee882961264d131cebdee04cb641c0d0de3d18 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Revert "JSCore build fix for WEC7"Janne Anttila2013-04-291-11/+0
| | | | | | | | | | | | | | | | | | | | I's reverted, because there seems to be at least two implementations of the stl in WEC7. One for each BSP SDK and one shipped with the compiler, which is in this case Visual Studio 2008. The Compiler has a stl with std::min etc. Visual Studio GUI also uses the compiler version of the stl first. It seems to be that the environment was setup wrongly. Checksdk also uses the right order. The same patch is reverted for Qt5 as well: https://codereview.qt-project.org/25482 This reverts commit 1fba05343eb6fea40f6617a62e31e10a0e918ec2 Change-Id: I956cc6f0669c67a094a2af464f8aa719a137a7a5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Harfbuzz: backporting fixes from upstreamAhmed Saidi2013-04-187-14/+23
| | | | | | | | | | | | | | | 81c8ef785b079980ad5b46be4fe7c7bf156dbf65 Fix crash! 81f2ecafa19b602f950df5a9e6e1b99c4b5ea55e Bug 30319 ff0612c2e7df1b86fc702c72e3015a6a5ae39b4c and 2dbd0fd11799c18bb6c66e337c3e31a1419823d4 Fix OOB access possibility 3bebe289aace6daa84b3d6983cebf5c58ddfad78 Fix problem with Indic shaper and control chars 90138e5a4d15c44f05456f90083ecacdc3196c8e Fix bad memory access in Myanmar shaper b847f24ce855d24f6822bcd9c0006905e81b94d8 Fix Arabic cursive positioning 3ab7b37bdebf0f8773493a1fee910b151c4de30f Fix misc leaks Change-Id: I6f3a6253782bff6abe4bf741d11c09fdd67542db (cherry picked from qtbase/7df995a9bd3e989b4136f98424490604eb5178aa) Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Silence warning from clangBradley T. Hughes2013-04-131-1/+1
| | | | | | | | | | | | | | | | | | | The original intent was most likely to memset() the entire MD5Context to zero at the end of MD5Final(), which we do now. In file included from tools/qcryptographichash.cpp:49: ...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24: warning: argument to 'sizeof' in 'memset' call is the same expression as the destination; did you mean to dereference it? [-Wsizeof-pointer- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ ~~~ ^~~ Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry-picked from qtbase commit 2bce4627e63947a3ed55009aeb8ff38974e444d3) Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* WebKit: Fix using macro to determine Mac user agent architectureJonathan Liu2013-03-181-1/+1
| | | | | | | | | | | | Using || operator with #ifdef is incorrect. As a result, the architecture for the user agent is incorrectly set to PPC on an Intel Mac. This is a partial backport of r128775 in WebKit upstream. Task-number: QTBUG-30187 Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Updated WebKit to 5fc7dcbe084a8ee8beda11b92dc2111be1285434Simon Hausmann2013-03-135-3/+38
| | | | | | | | | This brings in a fix for QTBUG-30081 as well as a backport of https://bugs.webkit.org/show_bug.cgi?id=103529 Change-Id: Ibcebe76d6999dc304d4c0323bbfa44be93909285 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gbAndy Shaw2013-01-301-0/+4
| | | | | | | | | | | | Due to a reported problem where the reserving of 2gb was too big under certain circumstances then in order to provide a means for people who hit this problem a define is added so that the VM_POOL_SIZE is set to be 1gb instead. This is an optional define and the default is for the size to be 2gb which keeps it to current behavior. Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> (cherry picked from commit f32c98f4876fd6f4d28d710d6ee1d59707b2ac62)
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131-1/+1
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Updated WebKit to 994432629cb04ffd8e1985dce9e9ed3a89236dd1Simon Hausmann2012-11-235-6/+15
| | | | | | | Includes fix for QTBUG-23258 and bumps the version accordingly Change-Id: Id5dd3c388cf6de88aea1b40bc9bdc2d5d6d80a31 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* On 32bit applications it would not get out of the waiting stateAndy Shaw2012-11-151-1/+1
| | | | | | | | | Specifically for 32bit applications it would not get out of the waiting state when using the Cocoa API, the QuickTime API works fine in this respect so we can fallback to this instead. Change-Id: I768009c1e90e8c67ed518288971f11c3e7a1c2ee Reviewed-by: aavit <eirik.aavitsland@digia.com>
* 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>
View Lorry Controller Status