summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Add binary compatibility files for 5.11 for QtWebEngineMilla Pohjanheimo2018-06-063-0/+45931
| | | | | | | Files for bic test added. Change-Id: I1ae9f54d70a9891248ad9d65efbf9ec29f022452 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Fix compilation with opengl es2Michal Klocek2018-06-053-16/+14
| | | | | | | | | | | | | | Do not include <QOpenGLContext> with gl_bindings.h since this will eventually include gl and gles heders into same compilation unit. Confilicting headers: third_party/khronos/GLES3/gl32.h third_party/mesa/src/include/GL/gl.h Change-Id: I0450a4084011ead4bfa80d68aeea3f5859df4c94 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2018-06-051-0/+0
| | | | | | | | | | | Pulls in following security patches: * CVE-2018-6135 * CVE-2018-6136 * CVE-2018-6134 * CVE-2018-6133 Change-Id: Icaa7bf00f77e1d7da75518e07118018f674646ab Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update ChromiumMichal Klocek2018-06-051-0/+0
| | | | | | | | | | | Pulls in following security patches: * CVE-2018-6132 * CVE-2018-6130 * CVE-2018-6129 * CVE-2018-6127 Change-Id: I5a1923d9d95ce61a9fc6dff58ccb79498b8e5ecb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Fix WebCursor scaling and hotspotJüri Valdmann2018-06-051-4/+25
| | | | | | | | | | | | | | | Old behavior: - Hotspot always chosen according to 2x devicePixelRatio. - Image always chosen according to 1x devicePixelRatio. New behavior: - Use actual devicePixelRatio. Task-number: QTBUG-68376 Change-Id: I6eef12a7dcf7fde7f8f488d9f2cba99f21e73cc2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update ChromiumMichal Klocek2018-06-051-0/+0
| | | | | | | | | | | | | Pulls in following changes: * 37866ea Fix race condition on gpu thread initialization * 1fc1c33 [Backport] CVE-2018-6120 * d8c9a86 [Backport] CVE-2018-6123 * 9a297a3 [Backport] CVE-2018-6124 * 0979afc [Backport] CVE-2018-6126 Change-Id: Ia8995000d8a5db0e3b23f445ab2d750e51609d23 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Narrow includeAllan Sandfeld Jensen2018-06-051-1/+1
| | | | | | | | Avoid including texture_manager.h that pulls in conflicting GL headers. Task-number: QTBUG-68244 Change-Id: I3174b00498e7a4772d2bb302d886071ba3bd2a64 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+85
| | | | | | | | Change-Id: I02a88abcac5e965abf7d1e9698aa5f7c332f5102 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 5e89c5356aade16a057d2a4ea84df3f420dbdf1f) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+49
| | | | | | | Change-Id: I75316370dc39564f013e558065e84defed89d3d9 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit cc526afe9c2cdd4502c90b8f9b505812c984ea08) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Ibe599310120ff0e817b0a855510184cbfe06f18f
* Fix segfault in QWebEnginePage::triggerActionJüri Valdmann2018-05-302-50/+61
| | | | | | | | Calling triggerAction for a context-menu-specific action (like DownloadLinkToDisk), when no context menu exists, will crash. Change-Id: Ife647b7a7d8ab1a0d9dcb7d3566be130516e6e63 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Do make freetype checks in Qt Gui and Qt WebEngine orthogonalKai Koehne2018-05-282-2/+14
| | | | | | | | | | | Qt WebEngine requires a newer freetype version then Qt Gui. Also, even if we fall back to 'Qt' freetype in Qt Gui doesn't mean that this version is shared with Qt WebEngine ... so it's best to completely detangle these. Task-number: QTBUG-68439 Change-Id: I081a23fe3e573d717a659e9bccebb14d68e97392 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix typo in configure.jsonKai Koehne2018-05-281-1/+1
| | | | | | Change-Id: I7f08f89bbd875a835a55c1378833c92ce246c564 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Apply settings on pending RVH tooPeter Varga2018-05-254-14/+9
| | | | | | | | | | | | | | | | | | | | This is an improvement of: bab4abab Keep settings synchronized when RVH swaps Updating settings during RVH swap is flaky because it happens after the load start of RenderFrame thus it is not guaranteed the ViewMsg_UpdateWebPreferences message is received by the render process before the load finishes. This means that the setting might not be applied on the current page if it was set during the navigation. The new RVH is created at the very beginning of the navigation, so access it via the pending or speculative main frame of the page thereby make it possible to update its settings before the load of RenderFrame starts. Task-number: QTBUG-66656 Task-number: QTBUG-68424 Change-Id: I4fbba597579551bb3329936ccd7b357cf8daa4ea Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* CookieBrowser: Support also incomplete URL'sKai Koehne2018-05-251-1/+1
| | | | | | | Use QUrl::fromUserInput to also handle URL's without protocol prefix. Change-Id: I8e9d4650ffe86886920b48170a6b188d2c0478c8 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Remove 'ignore = all' from .gitmodulesJüri Valdmann2018-05-241-1/+1
| | | | | | | I would like to see the changes in git status. Change-Id: I5b97af3cd467639aa4df1bcfd717f33c5b820c4b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Blacklist tst_QWebEngineSettings::setInAcceptNavigationRequestPeter Varga2018-05-241-0/+2
| | | | | | Task-number: QTBUG-68424 Change-Id: Idb72162b8aaa92a619fb7baf578f63e3d0171470 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Fix color space conversion of YUV video nodesSzabolcs David2018-05-231-3/+4
| | | | | | | | | | | YUV to RGB color conversion was not working, because the provided ColorSpace object was invalid. According to gl_renderer.cc, invalid color spaces should be treated as REC709. Task-number: QTBUG-68174 Change-Id: I1ad3b74ced4734e048256c075c953e9218ca6b6c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Doc: Add examples of enabling proprietary codecsLeena Miettinen2018-05-231-1/+18
| | | | | | Task-number: QTBUG-68364 Change-Id: Ib2079ccd211b537725fd0992e069c41df01c5e7b Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix overeager disabling of QActions in QWebEnginePageJüri Valdmann2018-05-191-5/+0
| | | | | | | | | Some actions, like Copy, are never updated and therefore need to be always enabled. Task-number: QTBUG-68354 Change-Id: I6827ee719ddc55cad3e4359379d1f2980f4b9618 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Update ChromiumJüri Valdmann2018-05-181-0/+0
| | | | | | | | | Reverts incorrect change to src/3rdparty in bd3687d2c5 and adds 96f354df27 Fix build with GCC 8.1.0 Change-Id: I6d4334598beb719aca0dabc96060630ea34015e9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove duplicated includeAllan Sandfeld Jensen2018-05-171-1/+0
| | | | | | | This was moved to later, but rebasing the patch lost this line. Change-Id: I5a8f098519bb4e0ab4dcd6a5855a4c8576a46753 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* Remove qwebchannel.js from test and exampleMichal Klocek2018-05-178-850/+4
| | | | | | | | Use qwebchannel.js shipped with qtwebchannel. Change-Id: Iceead5131d22a6988bbb4e7a3cca1e9f21908e3e Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Only add the first found widevine CDMAllan Sandfeld Jensen2018-05-172-0/+1
| | | | | | | | | Otherwise Chromium will pick the last added, meaning we will use the wrong one. Task-number: QTBUG-64071 Change-Id: Id5c939b6a5c70643ed047625c0cbb152dd8c7169 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Keep settings synchronized when RVH swapsPeter Varga2018-05-173-0/+47
| | | | | | | | | | | There can be more than one RenderViewHost assigned to a single WebContents. This is the case when starting a page load results changing processes. When applying settings during the load it updates only the old RVH. This fix applies the settings to the new RVH too after the swap. Task-number: QTBUG-66656 Change-Id: I833415b2a34f58e2a9a18c209a025c82b73aa65a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace invalid characters in WebChannel messagesJüri Valdmann2018-05-165-18/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out JavaScript's JSON.stringify is not guaranteed to produce valid UTF-16 strings. It is possible in JavaScript to produce string objects which contain invalid code units (unmatched surrogate pairs) and JSON.stringify will simply copy this data to it's output. However, such a string cannot be losslessly converted to UTF-8 and this leads to fun errors in WebChannelIPCTransport. This patch - Adds a test for the scenario above. - Changes WebChannelIPCTransport to replace these invalid code units with the Unicode replacement character U+FFFD. - Changes WebChannelIPCTransportHost to validate the data it gets from the renderer. Not validating the data defeats the whole point of Chromium's fancy multi-process architecture: the renderer is not to be trusted. - Changes WebChannelIPCTransport to throw JavaScript exceptions for various errors (missing argument, wrong type, invalid JSON). Seems like the polite thing to do. Task-number: QTBUG-61969 Change-Id: I83275a0eaed77109dc458b80e27217108dde9f7b Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Fix build without qtlocationAllan Sandfeld Jensen2018-05-161-0/+9
| | | | | Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Improve user experience in stylesheet exampleSzabolcs David2018-05-165-10/+87
| | | | | | | | | | | - Add checkboxes to make configurable whether a stylesheet should be applied - Add a default stylesheet which rotates the page by 180 degree. Task-number: QTBUG-64816 Change-Id: Ic82c61f9d1e5384f3271a260bc390ac50f5b9a12 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Fix keyboard focus for speculative RenderFrameHostsJüri Valdmann2018-05-152-2/+3
| | | | | | | | | | | | | | When encountering a 301 redirect, one render frame/widget is created for the original URL plus one "speculative" render frame/widget for the new URL. Once the speculative frame commits, keyboard focus should switch to the corresponding widget. This doesn't work however, because QQuickItem::forceActiveFocus doesn't give focus to the containing QQuickWidget. Fixed by using QWidget::setFocus. Also changed simplebrowser to focus the QWebEngineView on startup. Task-number: QTBUG-68076 Change-Id: I8dc42ba89bfdcd46a86c7dca357fdf1e94f439d4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove old focusProxy widget from layout in RWHVQDW::initAsChildJüri Valdmann2018-05-151-0/+3
| | | | | | Task-number: QTBUG-68224 Change-Id: I317915f0c81531e5858dfa3a76365b16266ce919 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Cleanup pdfium_document_wrapper_qt.h includeAllan Sandfeld Jensen2018-05-153-10/+6
| | | | | | | | | Do not make it depend on a define that could break precompiled headers, instead only included it when it is valid. Task-number: QTBUG-67977 Change-Id: I65f4de89de06d7a35c8dd97e4e9bd92d8c6dca54 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix tst_QWebEnginePage::openLinkInDifferentProfileJüri Valdmann2018-05-151-0/+1
| | | | | Change-Id: I9468faccfc8d943302bb643a57b9f7d1eed8862a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-0914-12/+233
|\ | | | | | | Change-Id: Id41b0b07a934994471df40de884e1231ee1c0e8e
| * Update Chromiumv5.11.0-rc2v5.11.0Allan Sandfeld Jensen2018-05-082-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulling in security fixes from Chrome 66.0.3359.139 Changes: a816f8401c Update the ICU shim headers a329fc0080 [Backport] [MemCache] Fix bug while iterating LRU list in range doom 492afe7432 [Backport] Merged: [keys] Don't keep chain of OrderedHashSets in KeyAccumulator 1785e2c1eb [Backport] Merged: [wasm] Call AsyncInstantiate directly when instantiating a module object Task-number: QTBUG-67800 Change-Id: Id84a3e58f5eb4fc7b8e73f57c8edb8f0574e6547 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Update changes with CVEsv5.11.0-rc1Allan Sandfeld Jensen2018-05-031-0/+6
| | | | | | | | | | | | | | Add a list of public CVEs security patches have been cherry picked for. Change-Id: I64703fea470070e79fb1327e960b59e0f7d88437 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Add reserved fields to the cookie filter requestAllan Sandfeld Jensen2018-05-012-2/+14
| | | | | | | | | | | | | | Makes it cleaner to expand it later. Change-Id: I2ccbcf143ca676c3fb89641b40e0848b6dd4bae8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Add changes file for Qt 5.11.0Antti Kokko2018-05-011-0/+114
| | | | | | | | | | | | | | Change-Id: I95f34b613e72c28ae1d9cfea02ccdb1d45f5c7db Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * Add fallback to qpa when query for glXGetProcAddressMichal Klocek2018-05-011-3/+21
| | | | | | | | | | | | | | | | Seems that with pyqt we have to fallback to qpa. Task-number: QTBUG-67898 Change-Id: I70889b4f5858f675e4692858de3dcb111c64c147 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2018-04-301-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: e0864b6551ba Revert "For local origins CanDisplay should be treated as CanRequest" c47570975b7e [Backport] Don't sniff file URLs for HTML. a2e3b4e55ea0 [Backport] DevTools: speculative fix for crash in NetworkHandler::Disable 98a2b309e128 [Backport] Use correct Request Context when EMBED or OBJECT requests an image 09731111686c [Backport] Remove usage of SEE_MASK_FLAG_NO_UI from ui::base::win 848a0b395f95 [Backport] Merged: [wasm] Call FatalProcessOutOfMemory on OOM d7809694d8ce [Backport] Merged: [turbofan] Properly test number of descriptors. 880dbfff351d [Backport] Revert "Roll libxml to 707ad080e61014ab4a6d60dc12875e233c1f673c" 9ad7a2ac8ae1 [Backport] Roll libxml to 7a1bd7f6497ac33a9023d556f6f47a48f01deac0 5ca051ce6e17 Fix use after free in DeviceMediaToMojoAdapter 24cf628c8e4a [Backport] [turbofan] Fix dead loop exit removal. 61b62c6ef03f [Backport] Use PaintLayer pointer from PaintLayerScrollableArea as PaintLayer is destructed first. 287955ba1c32 [Backport] VP9 GoF/temporal index check. 8c7d2f8a1cd6 [Backport] Check actual text length in InlineTextBox::IsLineBreak 1f64262b5d [Backport] Track the location of IHDR in PNG 7ae5eb6188 init out-param on buffer failure Task-number: QTBUG-67800 Task-number: QTBUG-67870 Change-Id: I6b68f4dd51b214f53bb8dcc0853e1559520764ef Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Install lost hooks for geolocationAllan Sandfeld Jensen2018-04-302-0/+24
| | | | | | | | | | | | Task-number: QTBUG-67904 Change-Id: Ib97ca78d8a7e489534c5985237782963f7295d80 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Fix invalid site instance when switching browser contextsJüri Valdmann2018-04-302-3/+38
| | | | | | | | | | | | | | | | | | All pages in a site instance should belong to the same browser context, an invariant which is violated by our WebContentsDelegateQt::OpenURLFromTab. Task-number: QTBUG-67900 Change-Id: I754180bb96de07448ee3058210391f7856f4caeb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2018-04-221-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 6e2354c9971e [Backport] service worker: Skip service worker for all Pepper plugins. 9908339e3989 [Backport] service worker: Disable interception when OBJECT/EMBED uses ImageLoader. 4ec3a984093e [Backport] Merged: [wasm] Avoid integer overflow on function locals check e9ec9ada1c39 [Backport] Enable <video> to see if a response from a service worker was cross-origin. c46b6312e1dd [Backport] Enable the Oilpan metadata canary in production builds. adb836fcdfcb [Backport] Oilpan: Disable prompty free for weak collection backings 3cf495268dd3 [Backport] Reland: Oilpan: Immediatelly promptly free objects. ba51ea1c97e3 [Backport] If a page calls |window.focus()|, kick it out of fullscreen. 744262b7512d [Backport] service worker: Disallow opaque responses for WebVTT. 0dcab5a6bd94 [Backport] DevTools: check Host header for being IP or localhost when connecting over RDP. 0558fd6946db [Backport] Fix MediaObserver notifications in MediaStreamManager. cbe8bec08847 [Backport] Map U+0454 (є) to 'e' (small E) e818a3dc9a83 [Backport] Add more entries to the confusability mapping 16c374f9f30c [Backport] Add a few more entries to the confusables list for IDN 43bff7cb2280 [Backport] [M66 branch] Add more to confusables list 75434e5f622e [Backport] Fix bug in async generators. Task-number: QTBUG-67800 Change-Id: I3728c42d8a7492b76748e2dfc9fa056852b1562c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Merge 5.11 into 5.11.0Oswald Buddenhagen2018-04-206-34/+49
| |\ | | | | | | | | | Change-Id: Ide3f60771813db37aac87fc7b7a8aae66d4fe1e0
| * | RequestController: Fix pure virtual method call crashJüri Valdmann2018-04-195-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug introduced by 4b30d82f05064723b9c3684e1c16ae0cf9d71baa where somebody had the bright idea to call reject() from RequestController's destructor. Of course, at this point the subclasses have already been destructed and a pure virtual method call error is triggered. Change-Id: Ida581285828c592a76f9ca981ec780f2711d298e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Remove hardcoded size from QWebEngineView::sizeHint()Szabolcs David2018-05-099-7/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 800x600 takes more space than expected when building a layout which contains QWebEngineView. Now this function does exactly the same as QWidget::sizeHint(). Add an auto test and update examples which were depending on this hardcoded size. Change-Id: I3b34b7d37cc99a8d6a49100d6c4b66b5b6a1c999 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Disable drag&drop on eglfs for qml appMichal Klocek2018-05-046-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The drag creates raster window, which on eglfs platform can be problematic. In case of running qml based browser without backing store, this will try to create a backing store during drag event, which will abort on eglfs. Therefore avoid the drag in qml in case the platform does not support multiple windows. This patch has the side effect of disabling drag even when qml runs with backing store, i.e. using QQuickWidget and therefore creating another raster window is not an issue. [ChangeLog][Behavior Changes] Drag&Drop is now disabled for QML based applications, when platform does not support multiple top-level windows (like EGLFS). Task-number: QTBUG-57516 Change-Id: I0c2685ba90914fe1f7168c79744c55e07e589488 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Update tests for "Don't create undeserializable mojo origins"Jüri Valdmann2018-05-022-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | Check that the workaround in src/3rdparty bf10f2f32a behaves as expected. Task-number: QTBUG-62536 Change-Id: Ieae4ad61df303aae5c65d4f7be487574ce32eae0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Add tests of Web Workers over local and custom schemesJüri Valdmann2018-05-028-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | Shared workers work, service workers don't. Dedicated workers over custom schemes trigger the same serialization error as WebSockets. Task-number: QTBUG-62536 Change-Id: I97b4b8c267f6cfca74bc0abfcca905b0adeabe3d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Fix hostcompiler test for qt 'root' buildMichal Klocek2018-05-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For qt root builds configure system injects qmake flags to compile config tests. To make hostcompiler test working correctly add missing "host" flag to configure.json file. Task-number: QTBUG-67983 Change-Id: Ia021ab8da8ec622f15d369357738dd8d778f2481 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Fix handling of bad @match directivesSzabolcs David2018-04-275-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | User scripts with parse errors in their @match patterns were included on all pages. Don't allow to fallback to "@include *" in this case. Task-number: QTBUG-67726 Change-Id: I8172184e79fe3e515f391bc6cc8274a624e67a19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>