summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* <chromium> FIXUP: Fix the build with a GL ES2 configured Qt.44-basedAndras Becsi2015-08-242-1/+4
| | | | | | | Add missing dependency revealed by the Windows CI. Change-Id: I34c47afaa0e39a78bf0ff863599862a8f5bc542b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <third_party/WebKit> FIXUP: Add missing dependency to khronos_headersAndras Becsi2015-08-201-0/+3
| | | | | | | This fixes ppapi build on desktop linux. Change-Id: I2201cd6523fe76173fbbc1e8f726adef1569ade4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <chromium> FIXUP: Fix the build with a GL ES2 configured Qt.Andras Becsi2015-08-191-0/+7
| | | | | | | Conditionally re-add khronos header export for OS X. Change-Id: Ifa89ff97d1cfe9b3d35a79c596442e22114c5abd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <third_party/WebKit> FIXUP: Add missing dependency to khronos_headersAndras Becsi2015-08-174-1/+5
| | | | | | | | Explicitly add khronos.gyp:khronos_headers dependency instead of relying on exports that regularly break QtWebEngineCore compilation. Change-Id: I74da1b261dc3954502818950ae01a261b975a3a2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <chromium> FIXUP: Fix the build with a GL ES2 configured Qt.Andras Becsi2015-08-1712-14/+7
| | | | | | | | | | Explicitly add dependency to khronos.gyp:khronos_headers instead of export_dependent_settings to prevent the in-source khronos path to cascade through to the QtWebEngine core layer, which would break all the code that uses Qt GL includes. Change-Id: I83ac5421f14fe27f7eab420e02652d7b162cb5df Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <chromium> Do not ignore make_global_settings for embeddedAndras Becsi2015-08-141-1/+1
| | | | | | | | We specify our compiler with make_global_settings and it should not be ignored. Change-Id: I47cecd9b164c58be060fec9818f6c24a268a1f63 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* <third_party/boringssl> Only define OPENSSLDIR if it is not already definedAndras Becsi2015-08-141-0/+2
| | | | | | | | For embedded we define our OPENSSLDIR which might be different from the default. Change-Id: Ied87502b76a79b47c5add3a763a9b88fed57318a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Revert "<third_party/jinja2> Prevent a python IOError on Windows"Peter Varga2015-08-051-3/+1
| | | | | | | | | | | | | | Remove the fix from commit: <third_party/WebKit> Prevent a python IOError on Windows due to MAX_PATH 13e265168bea1c64fcff3e4f9756b10d830893fe The following commit covers this issue: <tools/gyp> Prevent a python IOError on Windows 6621101b8fea1ed4f006ed84a4f59c6d4a134ef5 Task-number: QTBUG-46938 Change-Id: I7c4b27d47e1169117ddce8995f6028a778e28c47 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Revert "<third_party/mojo> Prevent a python IOError on Windows"Peter Varga2015-08-051-4/+0
| | | | | | | | | | | | This reverts commit 82846fd95406c4f8fc34def96486c12e87f21e71. The following commit covers this issue: <tools/gyp> Prevent a python IOError on Windows 6621101b8fea1ed4f006ed84a4f59c6d4a134ef5 Task-number: QTBUG-46938 Change-Id: I5230204fb8cc5770ea4d7c2898593ec6bfd12215 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* <tools/gyp> Prevent a python IOError on WindowsPeter Varga2015-08-052-0/+7
| | | | | | Task-number: QTBUG-46938 Change-Id: Ib0bba3192de570108010252dff0e15a2d4c977fd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* <third_party/WebKit> FIXUP: Prevent a python IOError on WindowsPeter Varga2015-08-051-0/+4
| | | | | | Task-number: QTBUG-46938 Change-Id: Ifd64a316e985ab176ec17ae4043b23a1bb24805d Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* <chromium> FIXUP Add ifdefs to exclude ATL and accessibility from the buildKai Koehne2015-08-051-3/+5
| | | | | | | | Fix build with Visual Studio Express by disabling the windows backend that requires ATL headers. Change-Id: I332e931d949e2e6e985fb02e0db044535cfa7df2 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* <third_party/skia> Remove a printf that pollutes the console on some pagesAndras Becsi2015-08-051-1/+0
| | | | | | | | This seems to be a leftover debug line that's polluting the command line output on some pages, this is visible at least on OS X. Change-Id: Ie8c0f682b0f5a6e88688f3d3f207152e3fb95fe6 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-30137-3159/+8092
|\ | | | | | | Change-Id: Ie5db510a9470dacbb91c4ab8fa7c73e2dee7d6a1
| * BASELINE: Update chromium to 44.0.2403.91Allan Sandfeld Jensen2015-07-29137-3159/+8092
| | | | | | | | | | | | | | | | Also adds missing compile_test tool, and removed two unused third_party modules. Change-Id: Ie6135c2a57c8c9519aa093eb0a259a605b26a111 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Fix Windows build with static ffmpegAllan Sandfeld Jensen2015-07-131-8/+8
| | | | | | | | | | | | | | | | | | We need the include override everywhere the C99 methods are overriden otherwise MSVC ends up believing these to be external and look for their DLL hooks. Change-Id: I47e65ea682864d591cf59f8e743f274bb1d3ad17 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/snappy> Optionally link with system snappyAllan Sandfeld Jensen2015-07-131-1/+33
| | | | | | | | | | | | | | Merges unbundle gyp so we may optionally use system snappy. Change-Id: I1036af5b646223cfc3d68f7a5fd56d92af94cb25 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | FIXUP: <third_party/zlib> Support use_system_zlibAllan Sandfeld Jensen2015-07-101-19/+0
| | | | | | | | | | | | | | | | Fix warning about double declared targets. Google zip is now defined in zlib/google/zip.gyp and works out of the box with system minizip. Change-Id: I914c7a3cc73bc48fb3b93e2109055f19e32bc148 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party> Optionally link with system opusAllan Sandfeld Jensen2015-07-102-0/+42
| | | | | | | | | | Change-Id: I57ca2544ec4779754467eb00478ec95efb94588e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Optionally link with system ffmpegAllan Sandfeld Jensen2015-07-103-0/+63
| | | | | | | | | | | | | | | | | | Merge unbundle version of ffmpeg.gyp and fix a few building issues, we must use the system FFMPEG configured defines and can not access the avformat internal struct. Change-Id: I0a8923e9ba72f2da6d5e2d1834f63c2a7c740b37 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Export fullscreen supported preferenceAllan Sandfeld Jensen2015-07-094-0/+8
| | | | | | | | | | | | | | | | | | By disabling this preference blink will be able to tell if fullscreen is supported before requesting it and will not show non-functional fullscreen buttons on youtube and other HTML5 videos. Change-Id: I2ed3828931e99295b634e6945d8ab97a1e8a34dd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/WebKit> Fix wheel scroll with pending fullscreen requestAllan Sandfeld Jensen2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | If we do not grant or haven't yet granted a fullscreen requests wheel events will currently be blocked. They should instead only be blocked in case there is an actual active fullscreen element. Change-Id: Icaff72f41e6fc45fffd3fa8cdb37c120a8d91c09 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Disable termination on out of memory.Joerg Bornemann2015-07-081-0/+2
| | | | | | | | | | | | | | | | | | | | By default chromium installs a new_handler that calls exit() when new/malloc fail to allocate memory. While this is a reasonable thing to do for a browser, a library should leave the decision to the user. Change-Id: Ice5ff8a3347a9df836fb298fed1e80bf21e6b7dc Task-number: QTBUG-45459 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | <third_party/icu> Optionally unbundle ICUAllan Sandfeld Jensen2015-07-072-24/+20
| | | | | | | | | | | | | | | | Fixes the existing use_system_icu setting that was not working due to problem in the build script and use of draft ICU 54 features. Change-Id: Idccd8fa1e45b8ba83b9b4937632cd98f26ecf0a0 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge branch 'upstream-master' into 44-basedAllan Sandfeld Jensen2015-07-07725-12917/+28884
|\ \ | |/ | | | | Change-Id: I6273ef9e92ca18de70c974fb8435a40218157f8c
| * BASELINE: Update to chromium 44.0.2403.80Allan Sandfeld Jensen2015-07-07725-12917/+28884
| | | | | | | | | | Change-Id: Ib190ddcbbb5f312742c16d159bdfe9dbf7360c8a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party> Optionally unbundle six third_party librariesAllan Sandfeld Jensen2015-07-076-0/+241
| | | | | | | | | | | | | | | | | | | | Merges gyp files from linux unbundle to third_party so we may optionally link to the system versions of these libraries. This affects: libevent, libwebp, flac, speex, vpx and jsoncpp Change-Id: Ic4f2ff412e43d873cd81d85a9ae639f30b53ec7e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/mojo> Prevent a python IOError on WindowsPeter Varga2015-06-271-0/+4
| | | | | | | | | | Change-Id: I36bf0c74cd9644bfe48989558a78427000b8925e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | <chromium> Fix Renderer and GPU threads on windowsPeter Varga2015-06-264-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | These threads are using the UI message loop on Windows per default. This won't work since the UI message loop is handled by Qt and the Renderer and GPU threads won't work with it properly. Force these threads for using the default message loop as they use it on Linux platform. Change-Id: I8b04ba9070912378cf1d13173ddff48e98f9a49b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | <chromium> Support use_system_zlibAllan Sandfeld Jensen2015-06-251-0/+70
| | | | | | | | | | | | | | | | Merges zlib gyp from linux/unbundled so we can use the system zlib on Linux. Change-Id: I65c2bd71cb2ff03c6e5f98c53c68f0516439e08b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Support use_system_libpngAllan Sandfeld Jensen2015-06-251-0/+41
| | | | | | | | | | | | | | | | Merges the libpng from linux/unbundled so we can enable using system libpng on Linux. Change-Id: I92b61e5a42bc6f0d1384a70c738b98951fe32781 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Move querying EGL extensions out of chromiumAllan Sandfeld Jensen2015-06-241-1/+2
| | | | | | | | | | | | | | | | We need to query the EGL extension in qtwebenginecore to avoid directly accessing EGL methods that may not be linked directly. Change-Id: Iddd1df70d2dd37964bb0cba70c2a3aa4c67d8002 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/WebKit> Fix include paths for shadow build on WindowsPeter Varga2015-06-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | Relative include paths are messed up in idl generated cpp files when performing shadow build on Windows 7. This fix replaces those include paths that refer to a header in a parent directory. Change-Id: Icd7db367536c371ef7621c0f7de359a1fb4f086f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Fix building chrome_switchesAllan Sandfeld Jensen2015-06-231-0/+2
| | | | | | | | | | | | | | Remove includes from components we do not support. Change-Id: I9e189da6d1f0e7c094bdcbddd1780ab8f1355fce Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Always ignore SIGPIPE.Michael Brüning2015-06-231-0/+3
| | | | | | | | | | | | | | | | | | Conditionally running SetupSignalHandlers in the content main runner led to crashes when SIGPIPE was not ignored. Task-number: QTBUG-44689 Change-Id: I0eddf52b9f760a23cc66ea5079b87f80d688cbdb Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/WebKit> Fix webfonts with wrong hinting on LinuxAllan Sandfeld Jensen2015-06-231-1/+47
| | | | | | | | | | | | | | | | This patch makes webfonts to read the fontconfig defaults for their size and font style. Change-Id: I80ffd8e2ff27d438c60457ca2b1836999e528783 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Enable localization codepath on OS X and LinuxAndras Becsi2015-06-232-6/+6
| | | | | | | | | | Change-Id: I5471953dbe08ee5afb92d24baeb94863fb8de98e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Do not include most componentsAllan Sandfeld Jensen2015-06-231-0/+12
| | | | | | | | | | Change-Id: I78159b07de2ec05891bbd8b9c3e2d482b9e07eda Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Disable requesting font family from ResourceBundlePeter Varga2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | The PlatformFont support is not implemented in QtWebEngine yet. Thus without disabling in case of requesting navigation error string (eg. default message for error page) accessing PlatformFont triggers an assert. Change-Id: I9a2b3035e03ecc5c43a50013886ff340f37d8806 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | <chromium> Remove the runtime dependency to QTKitJocelyn Turcotte2015-06-235-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | This always forces AVFoundation for QtWebEngine since we don't support OSX < 10.7 and the QTKit dependency prevents submitting applications using QtWebEngine to the Mac App Store. Task-number: QTBUG-43219 Change-Id: I835b594b2d2c0f6db1cf88072a7830ace215daf0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Fix a shutdown crash under CFAutoreleasePoolPopJocelyn Turcotte2015-06-231-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSAutoreleasePool init and dray must be symetrical and we can't guarantee that for ContentMainRunner as well as Chromium can since we initialize the ContentMainRunner on-demand but destroy it with the QCoreApplication's destruction. We also don't need to use it since any allocation that ContentMainRunnerImpl::autorelease_pool_ would cover is already covered at the bottom of the stack by the QCocoaAutoReleasePool in QCocoaEventDispatcher::processEvents. Change-Id: I2874916420457e3d36d08fb9fca0d919f374f592 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <v8> Define __ARM_ARCH_6ZK__ support for atomicops.Zeno Albisser2015-06-231-1/+2
| | | | | | | | | | | | | | This is needed for the raspberry PI. Change-Id: I0c46643a2877fccfadb7d0381788e440d901a6fa Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Disable GPU blacklisting for llvmpipe on WindowsMichael Brüning2015-06-231-0/+9
| | | | | | | | | | | | | | | | | | This works around the per-se disabling of hardware acceleration on older versions of Windows when the Gallium llvmpipe driver is used. Change-Id: I23dca61cf2309ad6f73279bb001358385866e438 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <chromium> Add ifdefs to exclude ATL and accessibility from the buildAllan Sandfeld Jensen2015-06-233-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ATL currently isn't distributed with MSVS Express, only with the Professional version. Chromium requires downloading the WDK iso for express users just to be able to use the ATL version that was shipped with it. We can avoid the extra dependency for now by cutting off all the accessibility code, which is currently the only part of the content layer depending on ATL. We will use the Qt accessibility code anyway. Change-Id: Iec25231250ccfc9405fdf342752733814888f348 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | <third_party/WebKit> Prevent a python IOError on Windows due to MAX_PATHJocelyn Turcotte2015-06-237-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running python down into the WebKit directory structure and referring a file relatively to the build directory can easily spill over the 260 char limit on Windows. Resolve the absolute path using join and normpath to work around the issue. The script for aggregating the generated bindings suffered from the same error on Windows as the other generator python scripts. The bison script for compiling grammars suffers from the MAX_PATH IOError issue on Windows. This occurs when doing a shadow build that results in large relative paths in the generated GYP actions. The scripts for generating and aggregating the v8 bindings all suffer from an IOError on Windows when doing a shadow build that results in very large relative paths being used in the generated GYP actions. Change-Id: I86f57fc94e8ff633e2499a08b8cafa7df9b39210 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | <chromium> Expose a status callback for the DevToolsHttpHandlerJocelyn Turcotte2015-06-232-0/+7
| | | | | | | | | | | | | | | | | | | | | | This allows us to give our own feedback on the console about the outcome of the server socket binding, outside of the Chromium logging. Change-Id: Ib16dd97b6f5e07ad2e889d3c4520b2fda1eb532b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com> Reviewed-by: Jocelyn Turcotte (Woboq GmbH) <jturcotte@woboq.com>
* | <v8> Use remove_v8base_debug_symbolsPeter Varga2015-06-231-0/+4
| | | | | | | | | | | | | | | | | | When this gyp variable is enabled the debug symbols of v8_base library are not generated. This reduces the debug section size of the libQtWebEngineCore library significantly (~25% less). Change-Id: Iad71af0ada4cd3924d66e47294c51dc2b554dbf7 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/WebKit> Fix building with MacOSX10.10.sdk.Zeno Albisser2015-06-231-3/+3
| | | | | | | | | | | | | | | | | | ScrollAnimatorMac.mm updated as done in WebKit: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@164767 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I6d9f864427a32192049792bb7395ae0abe1a07d6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/WebKit> Fix remove_webcore_debug_symbols=1Peter Varga2015-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | Remove -gdwarf-4 option too when remove_webcore_debug_symbols=1 is passed. Moreover, build webcore with size optimization since it is unnecesarry to disable optimizations when debug symbols are removed. These changes reduce the linking time of the QtWebEngine by ~50% in debug. Change-Id: I8b303ba5b798a862752affd575dd3309353c152f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | <third_party/nss> Disable warning about use of deprecated functions on Windows.Zeno Albisser2015-06-231-1/+1
| | | | | | | | | | | | | | This is only needed for compiling with MSVS2013. Change-Id: I92f4c25335936139cdec04f0a1b7e87e0ec41a9e Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
View Lorry Controller Status