summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enable precompiled headers for qtwebengine corev5.13.0-beta2Allan Sandfeld Jensen2019-04-092-1/+2
| | | | | | | | | | | | | Chromium requires us to add a special config to enable precompiled headers. Note this still depends additionally on that the corresponding GN flag is also set. Changes in 3rdparty: 9401dc18ce02 Add precompiled object files to qmake link output 8ba90427ae5e Improve the issue with long file names on windows Change-Id: I6680232e17a5254d3ca53e5a40e6a15a6b7fc82d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Unskip downloadUniqueFilenameWithTimestamp auto testPeter Varga2019-04-091-7/+4
| | | | | | Task-number: QTBUG-74764 Change-Id: I0e872449584b37c484e4d5ea46ba0bbc47124f51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge branch '5.12' into 5.13Allan Sandfeld Jensen2019-04-0942-197/+241
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/renderer/user_resource_controller.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-overview.qdoc Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
| * Run non-MainWorld DocumentCreation scripts even if JS disabledJüri Valdmann2019-04-082-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes regression, introduced by the fix for QTBUG-66011, where setting JavascriptEnabled to false stops all scripts from running instead of only MainWorld scripts (as documented). Only the DocumentCreation injection point is affected. The original change which introduced the regression consisted of moving the DocumentCreation injection point from ContentRendererClient::RunScriptsAtDocumentStart to RenderFrameObserver::DidClearWindowObject. The problem of scripts not working on view-source URLs was fixed by this move, but it turns out that the call to DidClearWindowObject happens to be conditional on Document::CanExecuteScripts and this is, of course, false if JS is disabled. Hence the regression. This new patch moves the injection point again to a task launched from RenderFrameObserver::DidCommitProvisionalLoad. DidCommitProvisionalLoad and DidClearWindowObject are both indirectly called from DocumentLoader::InstallNewDocument, however the former is called before the Document is opened and is therefore too early for script execution. As such, the execution is delayed by posting a task which, in theory, should be scheduled very soon after the normal call to DidClearWindowObject. Fixes: QTBUG-74304 Change-Id: Iac8714bcc5651c287b73181811af26996d955af5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into ↵Allan Sandfeld Jensen2019-04-052-4/+4
| |\ | | | | | | | | | refs/staging/5.12
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Allan Sandfeld Jensen2019-04-052-4/+4
| | |\ | | | | | | | | | | | | Change-Id: I8a087fefcb9f0f1c750747d29819e53c11984b41
| | | * Update ChromiumMichal Klocek2019-04-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in security patches: * [Backport] Security bug 933743 * [Backport] Security bug 917608 * [Backport] Security bug 916874 * [Backport] Security bug 914511 Task-number: QTBUG-74445 Change-Id: Id1ad904857e8f8e15208ae80c8c0258e3d8f4faa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | | * Update ChromiumMichael Brüning2019-04-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes the fact that WebEngine was passing POST data to Chromium even if the request was not a POST request. This triggered an assert in the backported code. 3aaf2ca833c [Backport] Security bug 906739 e4e10461659 [Backport] Security bug 906437 0a717e1dbe9 [Backport] Security bug 913212 c7fa9a16957 [Backport] CVE-2019-5803 ebe1e7068ca [Backport] Dependency for CVE-2019-5802 (1/5) 597dae52a3b [Backport] CVE-2019-5802 (1/5) 64d3770e5e9 [Backport] CVE-2019-5802 (2/5) a34d2fb5dd1 [Backport] CVE-2019-5802 (3/5) 62f25b2d83f [Backport] CVE-2019-5802 (4/5) a63d51633ab [Backport] Dependency for CVE-2019-5802 (5/5) c6d0023bc59 [Backport] CVE-2019-5802 (5/5) f7fcbe53871 [Backport] Security bug 905509 (1/13) 94f1317917f [Backport] Security bug 905509 (2/13) 812a9e68a2c [Backport] Security bug 905509 (3/13) 36c2c5e8b27 [Backport] Security bug 905509 (4/13) 8b01fa3780a [Backport] Security bug 905509 (5/13) 69b772f1e9a [Backport] Security bug 905509 (6/13) f2dfd87785a [Backport] Security bug 905509 (7/13) ec503eae3ed [Backport] Security bug 905509 (8/13) f5a4144a132 [Backport] Security bug 905509 (9/13) 03d8580cf59 [Backport] Security bug 905509 (10/13) 03c4a4ffb98 [Backport] Security bug 905509 (11/13) 700a4af1fb5 [Backport] Security bug 905509 (12/13) 03be3aa656a [Backport] Security bug 917707 269d53ceabd [Backport] Security bug 905509 (13/13) d720564a5ba [Backport] Security bug 938251 85136fedbde [Backport] Security Bug 929088 037efcfdba3 [Backport] Security Bug 931640 1/2 bea83ccee0f [Backport] Security Bug 931640 2/2 dd18af1614f [Backport] Security Bug 924905 e54c1076009 [Backport] Security Bug 919572 258feedf8e1 [Backport] Security Bug 919340 f4f1e852df5 [Backport] CVE-2019-5789 8566ec6cc21 FIXUP: [Backport] Security bug 905509 (3/13) 3d59c5717de FIXUP: [Backport] Security bug 906739 dd6863f4aea FIXUP: [Backport] Security bug 905509 43c92056fab FIXUP: [Backport] CVE-2019-5802 d6d21a17c5a FIXUP: [Backport] Security bug 913212 a4a129005d8 FIXUP: [Backport] Security bug 905509 38a6ae037ee FIXUP: [Backport] Security Bug 924905 d147ad350da FIXUP: [Backport] Security bug 905509 (3/13) Task-number: QTBUG-74445 Change-Id: Ic8d750bc89950c0e020eb43881dbf03328108940 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Normalize download path on WindowsPeter Varga2019-04-051-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-74698 Task-number: QTBUG-74251 Change-Id: I4358feb7fb28b226edb24ed10611e797fcd3c326 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Increase timeout and add some debug info to tst_dialogMichal Klocek2019-04-042-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-72113 Change-Id: I9b2dfb360a18995cae9e0e4a98443e796c3d8ad0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Make tst_dialogs less flakyMichal Klocek2019-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Wait to finish javascript execution before opening next dialog. Task-number: QTBUG-72113 Change-Id: I383e3fc3c405a94ddcbd74fe1cc7ab0d81c4e315 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Doc: Avoid auto-linking the string 'WebEngine' to the QML typeLeena Miettinen2019-04-0136-185/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the previous workaround (internal \externalpage command) that was used for this purpose, and replace it with a \QWE macro that expands to the string 'Qt \WebEngine'. The backslash in the expanded string instructs QDoc not to attempt auto-linking the word. Change-Id: If4e1c95423fa07479b1af055e4760a890c0ac667 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Improve configure -help outputKai Koehne2019-04-011-1/+2
| |/ | | | | | | | | | | | | | | Add a newline after the module title, like it is done for other modules. Also call the module "WebEngine", not "Webengine". Change-Id: I78579fb0ab131373212ea302eb5d3e5dd9cc62ca Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix timestamp deduplication for WindowsPeter Varga2019-03-281-2/+9
| | | | | | | | | | | | | | | | Based on https://chromium-review.googlesource.com/c/chromium/src/+/1432882 Task-number: QTBUG-74764 Change-Id: I74b4711f5146d2d2261487f13ccac702b9aa969e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update Chromium version numberAllan Sandfeld Jensen2019-04-081-2/+2
| | | | | | | | | | | | | | | | Also make the number more general as we will be updating the patch number at least once more before final. Change-Id: Ie9bfffb8f87fdb2c08a416ca1b977f7b0afc8c32 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2019-04-062-1/+1
| | | | | | | | | | | | | | | | | | | | Changes: 2cdff75f3db Fix crash in devTools layer tab on qt.io f72214e77a7 BASELINE: Update Chromium to 73.0.3683.105 d8e950cba2f Merge branch 'upstream-master' into 73-based Change-Id: I5eed1b0e4858254a7a74fbc5f9940dea4fbf1367 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Notification API cleanupKirill Burtsev2019-04-0517-111/+88
| | | | | | | | | | | | Task-number: QTBUG-74543 Change-Id: Ice5a0dbfc3485c8b7e6fa900ef427a9aed871d42 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Fix tst_Dialogs::authenticationDialogRequestedMichal Klocek2019-04-044-13/+21
| | | | | | | | | | | | | | | | | | | | Chromium returns unexpected proxy reply if localhost is used. Since proxy resolver works now, the workaround to trigger dialog with "localhost proxy" can be skipped. Change-Id: I26d88c43779809e4f481101266e6b8784a6b196d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTRAllan Sandfeld Jensen2019-04-0311-18/+18
| | | | | | | | | | Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Switch DevTools.loadNetworkResource to using SimpleURLLoaderAllan Sandfeld Jensen2019-04-032-87/+88
| | | | | | | | | | | | | | Follow similar Chromium changes. Change-Id: Idb0ab52517004c8bee7e7f7a919233b3f1b3ff59 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Update network traffic annotations and description for devtools policiesAllan Sandfeld Jensen2019-04-031-2/+2
| | | | | | | | | | | | | | Following https://chromium-review.googlesource.com/1074753 Change-Id: Idba6062b978fcff07d6fcb827d863605f06fcf9f Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Make the skip actually compileAllan Sandfeld Jensen2019-04-021-1/+1
| | | | | | | | | | Change-Id: I348fd097db179557d04cde224f6a49f0d1c2f97d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Update ChromiumAllan Sandfeld Jensen2019-04-011-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Changes: b7c3aa56eca9 Fix linking issue on some Linux builds 72b4b6fc4ee4 Remove assert on exit 6c2d06e60643 Fix Windows 32bit build 3d95374cb8de FIXUP: Fix Windows 32bit build Task-number: QTBUG-74854 Change-Id: Ifcf946b034a21a5263776ac1950700ce45e782f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Switch export macros to standard formAllan Sandfeld Jensen2019-04-0143-46/+46
| | | | | | | | | | | | | | | | | | | | Qt expects the export macros to have Q_ prefixes, otherwise the symbol versioning script won't find them and mark them. Task-number: QTBUG-74752 Change-Id: I1e057802f6715d170bdd9074f281e73fb96c9e52 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix -no-opengl buildPeter Varga2019-03-291-0/+5
| | | | | | | | | | Change-Id: I472ff20de710b1300c1f5209f3100b5280356f45 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Fix incorrect harfbuzz versionMichal Klocek2019-03-291-2/+2
| | | | | | | | | | | | | | | | We do require at least harfbuz 2.2 We need hb-aat.h for opentype. Change-Id: Ia2814de6045884b4574ee6c55e74f04005321ac2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Skip downloadUniqueFileNameWithTimeStamp auto test on WindowsPeter Varga2019-03-281-0/+3
| | | | | | | | | | | | Task-number: QTBUG-74764 Change-Id: I2638a6857e1d29ebacaafac3fff5daab57268b54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Blacklist tst_QWebEnginePage::runJavaScriptFromSlot on macOSAllan Sandfeld Jensen2019-03-281-0/+3
| | | | | | | | | | | | | | | | | | This is our most flaky test at the moment Task-number: QTBUG-74718 Change-Id: Ia7668347a74982abfb0297169f564db89944e87c Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" into ↵Allan Sandfeld Jensen2019-03-2826-39/+96
|\ \ | | | | | | | | | refs/staging/5.13
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-2826-39/+96
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/web_contents_view_qt.h src/core/web_engine_context.cpp Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
| | * Fix style of media audio controlsAllan Sandfeld Jensen2019-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The modern media controls in 69-based were not completely ready, so stay with the legacy media controls until 5.13. Fixes: QTBUG-74484 Change-Id: I06de16d8210341443a10d8c984f1978d373de0d9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Fix escaped characters in tooltipAllan Sandfeld Jensen2019-03-261-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Go back to making the tooltip richtext, but set a white-space:pre to keep the tooltip mostly unwrapped. Fixes: QTBUG-74659 Change-Id: I5e30ee0098a608eda969b090355915a75f55405f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Update ChromiumMichal Klocek2019-03-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in security patches: * [Backport] CVE-2019-5787 * [Backport] Security bug 906652 * [Backport] CVE-2019-5797 * [Backport] Dependency for CVE-2019-5797 2/2 * [Backport] Dependency for CVE-2019-5797 1/2 * [Backport] CVE-2019-5795 Change-Id: I273570d8c5d57e0ce441a6509360d862f2568bab Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Switch to setting 'official build' for non developer buildsAllan Sandfeld Jensen2019-03-234-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some things controlled by the OFFICIAL_BUILD defined are commented as unsafe to ship in production, so we need that as well. Note that GOOGLE_CHROME and OFFICIAL_BUILD are two different settings, so this just denotes the build as one shipped in production. Change-Id: I1fdcfec7f5c5142dd2bdc5f1d1f9a296a60e5708 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Fix regression in setting background colorsAllan Sandfeld Jensen2019-03-224-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This logic was incorrectly stripped out in adaptations for Chromium 68, but is still needed. Fixes: QTBUG-74519 Change-Id: Iefe7aba352bd43148898c1abeea34f4afe354d72 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| | * Fix markdown rendering of titles in recipebrowserAlexandru Croitor2019-03-217-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently not having a newline before each recipe title, prevented the markdown JS renderer from rendering the titles properly, instead the titles wee unformatted and also displayed the = signs. Add the new lines. Change-Id: I8176e8f3029ca2e80114d6555bbb73696ba51509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Fixup focus implementationAllan Sandfeld Jensen2019-03-2110-32/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the other implementation and pass TakeFocus to WebContents Delegate, and hook to our UI from there. Also fixes use of Blur instead of LostFocus, which means we now render unfocused more correctly. Change-Id: I34a1882489bc68b9ff36ed5139af0ee8a3a95b79 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Fix tabbing in recipebrowserAllan Sandfeld Jensen2019-03-212-5/+3
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-55146 Change-Id: I034ebb3e65341b5424a24d5a143013d726d55e10 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I353693b039d5ce923db1d18d5da15db1ae714e71
* | | Fix -Wmismatched-tags warningPeter Varga2019-03-271-1/+1
| | | | | | | | | | | | | | | Change-Id: I671e02850109e26c60771f583a3b5f29a1220452 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Do not run offscreen test on windowsMichal Klocek2019-03-271-0/+2
|/ / | | | | | | | | | | | | | | Offscreen plugin tries to open opengl handle and fails. Disable test for now. Change-Id: I6cecfef4e47a700ff720811f8e8dc4829a814821 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move RenderViewObserverHostQt to renderer_hostAllan Sandfeld Jensen2019-03-264-3/+3
| | | | | | | | | | | | | | | | It is the host side of RenderViewObserverQt in the renderer dir, so should be in the renderer_host dir. Change-Id: I497a6442130993237a0b823e7dcdd121bd72355a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Normalize download path on WindowsAllan Sandfeld Jensen2019-03-262-10/+1
| | | | | | | | | | | | Task-number: QTBUG-74698 Change-Id: I3fd4b932b1d4b0ecc844818f87c1824eac1f56e6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Blacklist download dir tests for windowsAllan Sandfeld Jensen2019-03-261-0/+11
| | | | | | | | | | | | | | | | | | Needs some cleanup to do comparisons FS-agnostic, and is currently blocking. Task-number: QTBUG-74698 Change-Id: Idca2753992aa8d1d63456694129325e757e572bc Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Notify extensions dispatcher when render thread has startedMichael Brüning2019-03-241-0/+1
| | | | | | | | | | | | | | | | | | Necessary adaptation to 73-based. Triggers initialization of V8 exten- sions and prevents hitting CHECK due to unintialized safe_builtins when loading a PDF. Change-Id: I1385ae6fb555e52ca74dd47669b3944f84a81580 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Use MessagePumpForUIQt for UI thread onlyJüri Valdmann2019-03-232-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In what almost seems like intentionally confusing terminology, Chromium draws a distinction between the UI thread and UI type threads. The thread's type refers mainly to the MessagePump implementation that it uses: currently MessagePumpForUIQt for all UI type threads. It turns out however that the desktop capture thread on macOS requires the original MessagePumpMac implementation for some macOS specifics. So, with this patch, MessagePumpForUIQt will be used only for the actual UI thread, and all other UI type threads will use upstream message pump implementations. Theoretically, this means that we cannot send events or async signals to these other UI type threads any more (sending events *from* these threads should still work). Practically though it seems safer to try, as far as possible, to not mix different event/task frameworks on the same thread. Change-Id: I81308d62c64354230796fccce2d3e0fa6cbb5013 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | Fix disabling http cache after 73-basedPeter Varga2019-03-233-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BrowserDataRemoverImpl::Remove() indirectly calls TransportSecurityState::DeleteAllDynamicDataSince() which notifies by a callback about the finished deletion since: https://chromium-review.googlesource.com/c/chromium/src/+/1335939 During the deletion the ProfileIODataQt::requestStorageGeneration() should not be called because it deletes net::TransporSecurityPersister which background_runner is where the finished deletion callback is scheduled. Change-Id: I4782d701f706ed7c8e104a78ba84a27183166fa4 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Adaptations for Chromium 73Allan Sandfeld Jensen2019-03-2357-410/+489
| | | | | | | | | | Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Adaptations for Chromium 72Allan Sandfeld Jensen2019-03-2343-199/+191
| | | | | | | | | | Change-Id: Ic355257066c7c1433862cb41e6f2bfa831147e0d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix exporting of WebEngineSettings::pdfViewerEnabledAllan Sandfeld Jensen2019-03-211-8/+9
| | | | | | | | | | | | | | | | The new version of WebEngineSettings wasn't registered Task-number: QTBUG-74566 Change-Id: I09c184556519743b519788874aefdc5a45755694 Reviewed-by: Michael Brüning <michael.bruning@qt.io>