summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.6' into 5.7Allan Sandfeld Jensen2016-04-111-0/+0
|\ | | | | | | Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
| * Update ChromiumJoerg Bornemann2016-04-071-0/+0
| | | | | | | | | | | | | | | | Pulls in build fix for MSVC 2015 Update 2. Task-number: QTBUG-52367 Change-Id: I57f17388b280eb79397cbba3e6b1b546d30be096 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2016-04-051-0/+0
| | | | | | | | | | | | | | Pulls in security fixes from Chromium 49.0.2623.108 Change-Id: Icb318aa21772eecb4b39f2bbe92ccdc0f020aee3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Use system NSS only for certificate handlingKai Koehne2016-04-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compiling against NSS 3.23 fails with current Chromium. Also, with NSS 3.21 there are failures connecting to e.g. google.com. Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL is always used for cryptography, and NSS only for certificate handlng. Patches included in 3rdparty update: 0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build. 0472123 Fix build against newer NSS 90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56 34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!" Task-number: QTBUG-52193 Task-number: QTBUG-51890 Task-number: QTBUG-52068 Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix CommandLine initialization on WindowsJoerg Bornemann2016-03-311-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Chromium insists on getting the command line via the system call GetCommandLineW. QCoreApplication already did that, and we want to pass the already split argument vector to init CommandLine. This way, the user can pass custom arguments to QGuiApplication, and Chromium will pick those up correctly. Task-number: QTBUG-51971 Change-Id: I85b2071fcd8e5781b13ec8d22dc00b1a0c71601b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Cherry-pick security fixes from Chromium 49v5.6.0Allan Sandfeld Jensen2016-03-031-0/+0
| | | | | | | | | | | | | | | | | | Update the Chromium SHA1 to include security fixes cherry-picked from the Chromium 49 release. Change-Id: Ia5ec7311a65bac886ed13f880b79242712e32ab9 Task-number: QTBUG-51636 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2016-02-231-0/+0
| | | | | | | | | | | | | | Pulls in recent security fix for same-origin bypass. Change-Id: I50bd658c16af72f14018cb97aa3f32fc1554a7c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Update Chromium SHAAllan Sandfeld Jensen2016-02-101-0/+0
| | | | | | | | | | | | | | Pulls in latest security fix from Chrome 48.0.2564.109 Change-Id: Ib21c27217d3b6108bf8cdbf414f31e523ccc373a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Update Chromium SHA-1 to include navigation type fix.Michael Bruning2016-02-091-0/+0
| | | | | | | | | | | | Change-Id: I6010404545efea5b40302c313e526ae1efd95d74 Task-number: QTBUG-50672 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update Chromium to 49.0.2623.111Allan Sandfeld Jensen2016-04-051-0/+0
| | | | | | | | | | | | | | Pulls in SHA based on updated Chromium Change-Id: I1d9125fdfa355344914dadc4eab7fef1c53dfc40 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Include RenderThreadImpl::Shutdown fix to prevent random crashes.Michael Bruning2016-03-161-0/+0
| | | | | | | | | | Change-Id: I953d38e00d24f3f11a5d801bb3b50babb46eb589 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Require OSX SDK version of at least 10.10.3.Alexandru Croitor2016-03-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Chromium 49-based uses new OSX API which was added in SDK 10.10.3. Make sure not to allow compilation in case the SDK version is lower than that. This also reverts commit 70ed3812fbe5eee6f62ddb26251f46061b0d3675 to allow compiling on OSX 10.9, with an appropriate SDK. Task-number: QTBUG-51350 Change-Id: Ib6dab0a1e16734cda9429363c90d2c8b8838d833 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update snapshot scripts to Chromium 49Allan Sandfeld Jensen2016-03-071-0/+0
| | | | | | | | | | | | | | | | | | The multi megabyte ICU assembler files are now omitted, as we instead either generate data files or use system ICU. Task-number: QTBUG-51173 Change-Id: I7c7594be08876751ffd73171550000a28399954f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update chromium submodulePeter Varga2016-03-021-0/+0
| | | | | | | | | | | | | | | | Pull in OS X build and symlink fix. Change-Id: I706a12c1919ebf35cbd260bbffeaa53c82efaac5 Task-number: QTBUG-51350 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Include printing sources and enable printing for desktop platforms.Michael Bruning2016-02-101-0/+0
| | | | | | | | | | | | | | | | | | | | | | Also adds Qt specific core classes for printing as well as adding printing related objects to the web engine context and including the printing sources in the builds for the desktop platforms. Also updates src/3rdparty submodule SHA-1. Change-Id: I9c2631c59f63571c0840d838077e66122bacc741 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-0/+0
|\| | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Disable WebSpeechAllan Sandfeld Jensen2016-02-011-0/+0
| | | | | | | | | | | | | | | | Also allows us to remove code handling libFLAC and libspeex since we no longer depend on those. Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2016-01-221-0/+0
| | | | | | | | | | | | | | Pulls in the fixes for public CVEs fixed in Chromium 48. Change-Id: I8738c7d0631e2e42ad844ada2b43dd614b4518c8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add API to set WebChannel on isolated worldAllan Sandfeld Jensen2016-01-151-0/+0
| | | | | | | | | | | | | | | | | | | | | | Make it possible to set a web-channel so that it can only be accessed by private scripts. Pulls in needed API extension in 3rdparty. Task-number: QTBUG-50318 Change-Id: I61bcce5c318dffe0a406ee8cddf31f58a021c22c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-121-0/+0
|\| | | | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * Update ChromiumAllan Sandfeld Jensen2015-12-171-0/+0
| | | | | | | | | | | | | | Pulls in recent patches in 45-branch. Change-Id: I5db148839ef3065a92ac1f9aac8ff0ee8eb7a2a0 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Stabilize test_urlPropertyv5.6.0-beta1Allan Sandfeld Jensen2015-12-141-0/+0
| | | | | | | | | | | | | | | | | | | | Pulls in Chromium patches that fixes crashes in the test, and add a missing waitForLoadSucceeded, that otherwise might cause the next test to fail. Task-number: QTBUG-48031 Change-Id: I4844aee0ccf159e50de955f3b3da704160a4a0f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Update ChromiumAllan Sandfeld Jensen2015-12-101-0/+0
| | | | | | | | | | | | | | Pulls in the last of the Chromium 47 security fixes Change-Id: Iaffa0a727948a45ca1dea036823bab2399105e09 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Update Chromium SHA1Allan Sandfeld Jensen2015-12-081-0/+0
| | | | | | | | | | | | | | Pulls in most of the security updates from Chromium 47 Change-Id: I1c023deb97a9d1b4f24c8573127d135672ed7ab4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Update Chromium SHA1Allan Sandfeld Jensen2015-10-281-0/+0
| | | | | | | | | | | | | | Pulls in the lastest 45-based SHA1 Change-Id: I7111143db7697cfa3861ba26255102717d1d39e2 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Compilation fixes for MSVC 2015 (64 bit)Kai Koehne2015-10-231-0/+0
| | | | | | | | | | | | | | Take in compile fixes for new ninja, and MSVC 2015 (64 bit). Change-Id: Iaa2531a507e2c7034dfe39813c952d7ad75e7285 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update Chromium to 47.0.2526.109Allan Sandfeld Jensen2016-01-051-0/+0
| | | | | | | | | | | | | | Also pulls in the CDM component. Change-Id: Ide70c3f8872b55473d17c32de65046fb3b0ced05 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update Chromium 47.0.2536.71Allan Sandfeld Jensen2015-12-011-0/+0
| | | | | | | | | | | | | | Including a few missing spellcheck files. Change-Id: Idffb0f5bc4411764c4079a314b21e656f8e892e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | [Windows] Fix build on 32 bit hosts and update src/3rdparty.Michael Bruning2015-11-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The default Windows SDK path is different on 32 bit machines. Adjust it to look for the D3D dlls in the right location. Co-Authored with Kai Koehne. Also updates 3rdparty submodule to enable builds with MSVS2015 and let the merge from 5.6 to dev pass the CI. Change-Id: Ifb31a0e379c978b238b3437170c53a02cbde0349 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Update Chromium SHA1Allan Sandfeld Jensen2015-11-061-0/+0
| | | | | | | | | | Change-Id: I0b9710a221ebd85b71b96c1a8b664b0792428cab Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Adapting to Chromium 47Allan Sandfeld Jensen2015-10-271-0/+0
|/ | | | | | | Updating to Chromium 47 and adapting API. Change-Id: Id465bbcd4facd7c47cb8a9f4bd4e18cbdc0d1120 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Enable building with MSVC 2015Kai Koehne2015-10-191-0/+0
| | | | | | | | | Enable MSVC 2015 in prechecks and fix error C2308: concatenating mismatched strings Task-number: QTBUG-47541 Change-Id: Ia583e2963c7e6ef8327909b91c8df04aeb17eb07 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix ABI breakage due to fullscreen featureAllan Sandfeld Jensen2015-10-191-0/+0
| | | | | | | | | | | We can not add a new virtual method without breaking ABI on some platforms, instead we need to use a setter. The API now uses a request object, and a separate signal for canceling, since canceling can not be rejected. Change-Id: If8069c343e86926293c30e8de179bf4e3cbd5886 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update to Chromium 45.0.2454.101Allan Sandfeld Jensen2015-09-301-0/+0
| | | | | Change-Id: Ifda982e1bcfc2a0655e65a71321b137a348be865 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update dependenciesAllan Sandfeld Jensen2015-09-181-0/+0
| | | | | | | | Add more pkg-config based libraries that we need to build Qt WebEngine and update Chromium SHA so that we do not need ATK. Change-Id: I713823e3dcad9b9f5a112d500d23281ac59c307b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Enable building linux-clang platformAllan Sandfeld Jensen2015-09-071-0/+0
| | | | | | | | Adds the necessary flags to build with clang on desktop linux. Change-Id: I77f8937849bceefbae17158421a180e4a1adc2d3 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Bumb Chromium to include pkg-config fixAllan Sandfeld Jensen2015-09-061-0/+0
| | | | | | | Fixes cross-builds. Change-Id: Ic06fcd65b34d1079d9cc7de6611ebf1fd93c0959 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update to Chromium 45.0.2454.79Allan Sandfeld Jensen2015-08-261-0/+0
| | | | | Change-Id: Id986be0af632884ae4e7d0fb2023e71c449a9eae Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Rebasing on Chromium 45Allan Sandfeld Jensen2015-08-251-0/+0
| | | | | | | Fixing the minor differences needed to work with Chromium 45. Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix the build on embedded linuxAndras Becsi2015-08-241-0/+0
| | | | | | | | | | | | This patch: - adds required options to the embedded_linux.pri config - adds missing events_ozone.gyp:events_ozone_evdev dependency - fixes pkg-config not to pick host paths when cross compiling - implements missing functions of the OzonePlatform interface - updates the submodule to include fixes for chromium Change-Id: I77b384738fa7d41938a68c10a007728b10d7db28 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-301-0/+0
| | | | | | | Also updates snapshot script for removed, added and renamed modules. Change-Id: Ie511cbddc2f7c03d9f73f7ae190701539bc91d4d Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update Chromium version to 44.0.2403.80Allan Sandfeld Jensen2015-07-151-0/+0
| | | | | | | | Also switch to parsing DEPS instead of .DEPS.git as the latter has been removed from upstream chromium. Change-Id: Ie449e310202458c5c514a5eb6af2d30486ec0891 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge Chromium 44 and fixesAllan Sandfeld Jensen2015-07-061-0/+0
|\ | | | | | | | | | | | | Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch, which contains all the patches to build against Chromium 44. Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
* | Update snapshot SHA1Peter Varga2015-06-161-0/+0
| | | | | | | | | | | | | | | | | | | | The update contains the remove_v8base_debug_symbols change and enables it. This shrinks the debug library size even more. In case the symbols are needed CONFIG+=v8base_debug can be passed to qmake. Change-Id: I1a9e78163343257d76b7842ba592979db95b992a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Update chromium branchAllan Sandfeld Jensen2015-05-261-0/+0
|/ | | | | | | | Pulls in the recent security fix. Change-Id: I1dac6591c11445619518334d530e9dd8d408a541 Task-number: QTBUG-46261 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Prevent conflicting declaration errors of GL typedefsv5.5.0-beta1Andras Becsi2015-04-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including gpu/command_buffer headers in Qt code pollute by including ui/gl/gl_bindings.h which pulls in system GL headers. This will cause conflicting declaration of typedefs when included together with content/gpu and content/common/gpu headers which pull in gles2_cmd_format.h that forward declares some GL types. Although the gl_bindings.h header states in a comment that it should only be included in source files, the inline implementation of texture_manager.h and some other low-level GL integration headers nonetheless require gl_bindings.h, which unfortunately cascades through to our core layer and may cause problems when Qt code is compiled. Since getting rid of this include in Chromium's headers is not feasible due to maintenance costs, making sure that in Qt code gpu/command_buffer headers are included before content/gpu and content/common/gpu headers and guarding forward declarations in gpu/command_buffer/common/gles2_cmd_format.h should be a sufficient workaround. We can however get rid of the polluting includes in src/core/gl_surface_qt.cpp, which only requires forward declarations. This also includes a SHA1 update for the Chromium submodule. Task-number: QTBUG-44240 Change-Id: I5813a3663d36e2b565e4fd7f429add7b6f8f8a69 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Update snapshot SHA1Peter Varga2015-04-231-0/+0
| | | | | | | | This update removes android files and contains localization fix. Task-number: QTBUG-45715 Change-Id: Iac08a5c18514c605265aad875b30f7cb5307b420 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update snapshot SHA1Peter Varga2015-04-081-0/+0
| | | | | | | Various path fixes for shadow building on Windows. Change-Id: Ida98f3d5a993dfda4e13f211318c25f4567cd145 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Update submodule SHA1Michael Brüning2015-03-161-0/+0
| | | | | | | | | | This includes the fix for SIGPIPE handling and the reversion of the Mojo geolocation IPC patch. Task-number: QTBUG-44689 Change-Id: Ib2b6618029b6390e1570f1becdd868ae66f9779f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Update snapshot SHA1Andras Becsi2015-03-121-0/+0
| | | | | Change-Id: Iaf88dafa49502a84a78f2294ea68a9885b6c8957 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 23:27:18 +0000