summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix freezes of glx context63-basedMichal Klocek2018-03-123-5/+11
| | | | | | | Add back support for compatibility profile. Change-Id: I746b53c4622614f847540481cdb43da416ba03b1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix mixing chromium gles2 types with qt defined onesv5.11.0-beta2Michal Klocek2018-03-083-2/+3
| | | | | | | | | | Avoid including chromium gles2 headers. This triggers confiflic declaration between khronos_ssize_t which is 64bit and ptrdiff_t which is 32bits on 32bit platforms. Task-number: QTBUG-66597 Change-Id: Icade95463365e05803f7f84889d0d3618ad48d65 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Do not export .gitignore and .gitattributesAllan Sandfeld Jensen2018-02-141-0/+2
| | | | | | | | | Copied from standard code in .gitattributes in other qt modules. Task-number: QTBUG-62952 Change-Id: I48739086536fc56abe610f7e36112283d6d1b73a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* [Backport] Add a .gitattributes file to force LF line-endings in .pins files.martijn2018-02-141-0/+2
| | | | | | | | | | | | | This change forces the pins files to use LF line-endings and adds a check to detect CRLF line-endings that outputs a more helpful error message. BUG=729553 Change-Id: I9a470c1d07dcacabcae1ce9029f35323cd86b4d2 Review-Url: https://codereview.chromium.org/2941543002 Cr-Commit-Position: refs/heads/master@{#485165} Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* FIXUP: Forward declare newer EGL typedefsv5.11.0-beta1v5.11.0-alpha1Allan Sandfeld Jensen2018-01-291-0/+3
| | | | | | | | EGL autobind now also uses EGLnsecsANDROID Task-number: QTBUG-66038 Change-Id: I336f53c5678cccacf32ed5214fbacd24da2a71d2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Adapt ProtocolHandlerRegistry for WebEngineJüri Valdmann2018-01-293-3/+33
| | | | | | | | Disable persistence, OS integration and Chrome-specific features. Task-number: QTBUG-62783 Change-Id: I33d8c3a59de9876a466aacada7e5d5c307352d14 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Import ProtocolHandlerRegistry and related classesJüri Valdmann2018-01-296-0/+1576
| | | | | | | | Import additional files from Chromium 63.0.3239.117. Task-number: QTBUG-62783 Change-Id: I5ddf38675807d189dd056a79004e2d80abb7fe54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* FIXUP: Adapt licenses.py for qdoc needsAllan Sandfeld Jensen2018-01-241-0/+1
| | | | | | Change-Id: I1b8235df5895650b7ea1de11b91e1cfe1ab2e026 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Disable location requests to the geolocation google APIPierre Rossi2018-01-222-0/+9
| | | | | | | | If we don't have a valid token, it will fail anyway. And for now we don't provide a way to use an existing API token. Change-Id: I7208d5ebc9ba7350622686e208761950f26bdc63 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Leave a chance to all location providers to get a fixZeno Albisser2018-01-222-6/+14
| | | | | | | | | In our case, the NetworkLocationProvider will always fail for lack of a valid API token, and we don't want that to take precedence over the QtPositioning-based backend. Change-Id: Ic175bd3fb527a76a578ef3568f7ac7ed07c4ccad Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Make optimize_for_size an arg againAllan Sandfeld Jensen2018-01-221-11/+13
| | | | | | | | | Otherwise we can not configure it. Change-Id: If2900e9f142c945c921df46be21e7eb14ee2d1cb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix hanging of process when application is closed too fastAlexandru Croitor2018-01-221-4/+4
| | | | | | | | | | | | | What essentially happens is that the main thread is waiting for all other threads end, whereas an IO thread tries to recreate the in-process GPU thread, fails, tries again, fails and so on. The fix is to move the condition that checks that the application main loop has not finished, earlier. Task-number: QTBUG-65239 Change-Id: I5800d19b986657a249b1f672c95297d01f8dc11b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix building with enable_reporting=falseAllan Sandfeld Jensen2018-01-222-2/+10
| | | | | | | | | | The feature is default on at run-time and we don't use it. Cherry picked from 61-based: f0775ea93ab66f0676993db1633c9098dfb3a3ad Change-Id: I6c89f82e9ce4570a1ed28e4e5ba5cfefb99a114f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* [Backport] Reset the last known mouse mousing on MouseLeavePeter Varga2018-01-223-1/+8
| | | | | | | | | | | | | | | Reset the last known mouse position to be unknown when we get a mouse leave or when the target of an iframe changes. BUG=788690 Reviewed-on: https://chromium-review.googlesource.com/814696 Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org> Commit-Queue: Dave Tapuska <dtapuska@chromium.org> Cr-Commit-Position: refs/heads/master@{#522877} Change-Id: Ia02e3a554cb14a7c32ce81308ff82f80cfab392d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* FIXUP: Fix GN bootstrapAllan Sandfeld Jensen2018-01-181-1/+1
| | | | | | | Fix typo. Change-Id: I853c820a3102bb5be5dfd6f7ad3000b91dbf6882 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* FIXUP: Fix GN bootstrapAllan Sandfeld Jensen2018-01-171-0/+3
| | | | | | | Add more sources files need by OSX 10.11 Change-Id: I432ee65555d8d6b73094b20ebec0491146feae6d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* FIXUP: Fix assert on chrome://gpuPeter Varga2018-01-111-0/+3
| | | | | | | Guard the usage of an unimplemented getter function. Change-Id: I90ad502ada44a10be131c8f63424d0f71e00efbb Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* FIXUP: Fix GN bootstrapAllan Sandfeld Jensen2017-12-191-0/+1
| | | | | Change-Id: I772a1f10134bfe94637c845c8690d54376ed7d1b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge branch 'upstream-master' into 63-basedAllan Sandfeld Jensen2017-12-1947-112/+2341
|\ | | | | | | Change-Id: I9909647008cf4786e87f83733a4d82ce9286ea85
| * BASELINE: Update Chromium to 63.0.3239.117Allan Sandfeld Jensen2017-12-1947-112/+2341
| | | | | | | | | | | | | | And add two chrome files we need. Change-Id: Ie4b6cefa8ea274623132c3ce59f951de8ea4ec6c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | FIXUP: Fix build on windowsAllan Sandfeld Jensen2017-12-191-0/+6
| | | | | | | | | | | | | | Also short-cut the message compiler before it starts diffing. Change-Id: I2be5561d4f0cda0c24a176cb764770e3b8f3cee3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | FIXUP: Fix GN bootstrapAllan Sandfeld Jensen2017-12-191-0/+1
| | | | | | | | | | Change-Id: I1db5581e400fb19e2ec436765845c90ef60e307c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | FIXUP: Add spellcheck as exposed interfaceAllan Sandfeld Jensen2017-12-181-0/+1
| | | | | | | | | | | | | | We now need the interface to the renderer too. Change-Id: Ibe977c1a9f7cf0869464a2ddc671b62264caf7b2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix mac build after Chromium 61-63 mergesAllan Sandfeld Jensen2017-12-189-15/+16
| | | | | | | | | | Change-Id: I4656cc36b3ac4bf75f58aea988f168c2dcc3e032 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix non-Google clang buildsAllan Sandfeld Jensen2017-12-147-9/+11
| | | | | | | | | | Change-Id: I27d840de3ebf53b0791644a68083beb351631366 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add all devtools resources to our resource pakAllan Sandfeld Jensen2017-12-141-0/+4
| | | | | | | | | | | | | | Do not let some be for remote fetching only. Change-Id: I33efd366b957396a746f7bb14bd0a6977ed93b9e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | FIXUP: Reduce warning flood when compiling with clangAllan Sandfeld Jensen2017-12-141-3/+5
| | | | | | | | | | | | | | | | The old flags for ignoring unknown options were needed in cflags not in cflags_cc. Change-Id: Ie90d00397119872d13696246b6f4878533519686 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix build with gcc 5.xAllan Sandfeld Jensen2017-12-136-8/+8
| | | | | | | | | | Change-Id: I93f710ed9c493d11c4982ef46c4fba20424b0b14 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix override of mallocAllan Sandfeld Jensen2017-12-121-0/+1
| | | | | | | | | | Change-Id: I79f02eec0324301544da18ee98931f164c97ccd1 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | FIXUP: Fix GN bootstrapAllan Sandfeld Jensen2017-12-121-2/+0
| | | | | | | | | | Change-Id: Ic4f2c9dcc4db047374324ca6087187c2196c3dfe Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix build with gccAllan Sandfeld Jensen2017-12-111-0/+1
| | | | | | | | | | Change-Id: Ib486869a9400cc1f77addbd68acec66315d7a1bf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix build on windowsAllan Sandfeld Jensen2017-12-112-1/+7
| | | | | | | | | | | | | | Fix more Chromium build bugs introduced with Chromium 63 Change-Id: Idc33d97199728f6ae81ff2a5255f3e51cb8c331c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/upstream-master' into 63-basedAllan Sandfeld Jensen2017-12-08591-3338/+66919
|\ \ | |/ | | | | Change-Id: I4d88054034fccbb7409fa65c37d4498b74ec0578
| * BASELINE: Update Chromium to 63.0.3239.87Allan Sandfeld Jensen2017-12-08591-3338/+66919
| | | | | | | | | | Change-Id: Iac27464730121b4fac76869d87d622504642e016 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Allow late fullscreen changed signalAllan Sandfeld Jensen2017-12-054-32/+27
| | | | | | | | | | | | | | | | | | Chromium expected fullscreen mode to be accepted or rejected synchronously, that fits poorly with our API, so instead we add the option to signal when fullscreen mode actually changes. Change-Id: I72b93417790cf273194df480a220a498a71deb74 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Reduce warning flood when compiling with clangAllan Sandfeld Jensen2017-12-051-2/+4
| | | | | | | | | | | | | | "cause the night is crap and full of warnings" Change-Id: Ic391ac12428c23ccfde8bc4aa5eaa0fa64235ff3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix API to allow InspectElement to work with remote inspectorAllan Sandfeld Jensen2017-12-051-1/+7
| | | | | | | | | | | | | | | | | | | | With the remote inspector, the internal server creates the clients, and we in the external API does not know the client. The devtools agent host impl does however know all the sessions, and when there can be only one it can figure it out. Change-Id: I55a79cc90d39e6203d74a63ce86575599fe58232 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Do not pick up CFLAGS,CXXFLAGS,LDFLAGS for gn bootstrapMichal Klocek2017-12-051-3/+8
| | | | | | | | | | | | Task-number: QTBUG-64759 Change-Id: Ifd366e496ce08365f63216943f93864fc285b8b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix of build-time race conditionsAllan Sandfeld Jensen2017-12-052-0/+3
| | | | | | | | | | | | | | | | Add dependencies so needed input files are more reliably generated before being referenced. Change-Id: I5fa339910ca9ff2d24ce967002c41d23331ad121 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Use default MessageLoop type for NetworkConfigWatcherMac threadAlexandru Croitor2017-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the NetworkChangeNotifierMac::ReachabilityCallback is actually called from the native CoreFoundation event loop. This was not the case before because WebEngine overrides the TYPE_UI message loop with a QEventDispatcherUNIX, which does not integrate a CoreFoundation loop within, thus never calling the respective callback. Task-number: QTBUG-61364 Change-Id: Id07bb46dfeb114e4b434acebb93c07d338bb3d1f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix assert with devtoolsAllan Sandfeld Jensen2017-12-051-1/+5
| | | | | | | | | | | | | | | | | | Qualified names are read from two different threads in debug mode, so the strings they return must be safe to access from the current thread. Change-Id: I071c057e4fd2c215b36a0897058499c678250668 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix most warnings about nested elseAllan Sandfeld Jensen2017-12-052-2/+4
| | | | | | | | | | | | | | Fix two headers triggering the gcc warning the most. Change-Id: I5b2483b8daac998e368f7f8a5edc6185d23df350 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Disable all gpu features usage when using nouveauMichal Klocek2017-12-051-4/+0
| | | | | | | | | | | | | | | | | | Nouveau drives do not support well multithreading. Disable for all driver versions. Change-Id: Id74ae832140a3e09db445edb8d6303c45b75b88f Task-number: QTBUG-41242 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | Optionally unbundle OpenH264Allan Sandfeld Jensen2017-12-052-6/+53
| | | | | | | | | | | | | | Adds GN logic to use system OpenH264 on Linux. Change-Id: I2904a45c34e86325e0f6fc77a67c1a204e832556 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Remove reference to safe_browsing constantsAllan Sandfeld Jensen2017-12-051-0/+4
| | | | | | | | | | | | | | We don't build those in QtWebEngine. Change-Id: I3e32bb3cded39ef8b7f8f3d0da653a71a89fa341 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix build with g++ < 6Allan Sandfeld Jensen2017-12-051-4/+4
| | | | | | | | | | | | | | | | The enums in inlined constructors and destructors need class namespace in this case too. Change-Id: Iec442f9a7779c66597e11fa670da9f991d4ab791 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | [Revert] Uprev NSS requirement on Linux to 3.26Allan Sandfeld Jensen2017-12-052-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the upstream commit that upped the minimum NSS version because Google certificates are signed by a weak root which causes warnings in earlier NSS versions. Since NSS is a shared library, doing a build-time check is pointless, and we still have CIs with old versions. Original commit message: BUG=691261 Change-Id: Ib7396ffb27e20e3dff041266d523a842d2c5d9c7 Review-Url: https://codereview.chromium.org/2721373002 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix Chromium built with X11 running withoutAllan Sandfeld Jensen2017-12-059-16/+28
| | | | | | | | | | | | | | | | Handles cases where gfx::GetXDisplay() returns null at least for Qt. Task-number: QTBUG-55384 Change-Id: Ie57c57d7189c279cb5c702325b450f9fb964ac60 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix improper boolean valuesViktor Engelmann2017-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | jpeg_codec.cc contained some implicit conversions to boolean, which is apparently problematic for some versions of libjpeg. Patch taken from https://bugs.chromium.org/p/chromium/issues/detail?id=686191 but not backported, since it has not been accepted into chromium yet. Task-Number: QTBUG-58482 Change-Id: I2c5d5894493d6a7d0698a4e5a7191288a2fdfeb4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Do not assert on PPAPI resources we do not support.Allan Sandfeld Jensen2017-12-051-0/+6
| | | | | | | | | | Change-Id: I54b6571549d3c646e359df8ecda85af27f2ea7e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
View Lorry Controller Status