summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Only warn the user about conditions that are not metMichael Brüning2022-10-181-1/+4
| | | | | | | | | | | | | | | | When loaded from a plugin, we printed a warning about setting the application attribute Qt::AA_ShareOpenGLContexts and choosing OpenGLRhi as the scene graph renderer interface even when those conditions were already met. This patch checks if these conditions are already met before printing the warning. Change-Id: Iee06fa4560e022f0611f07a082513dc91c8065c9 Fixes: QTBUG-103958 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 9e5214e617471b326cc975095054f859924b4168) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-171-4/+4
| | | | | Change-Id: Id97a00182f63ae42a25c20789df6d9c3f7929723 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix fullscreen request blocking after running fileChooserMartin Negyokru2022-10-141-0/+4
| | | | | | | | | | | | Chromium blocks fullscreen requests while the fileSelectListener is alive. Release it manually after the accept/reject signal. Fixes: QTBUG-106975 Change-Id: Iac4868b8ab0268b8ddb94912286155af73ebd343 Reviewed-by: Szabolcs David <davidsz@inf.u-szeged.hu> Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 1837eeb96693116ba4ec8542035003cac67421bc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-141-4/+4
| | | | | Change-Id: I2bf48b8d743e6586155ae00a460361190a5fc04a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix GCC compiler warnings in auto testsPeter Varga2022-10-133-9/+13
| | | | | | | Change-Id: I9daae92749e7dbe0580c17e8f0325e2199b2ed17 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit cd82a30311302ded70b278bfc4919097b0f421f7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Simple Browser example: Fix startup flicker on WindowsFriedemann Kleint2022-10-134-4/+16
| | | | | | | | | | Ensure the initial browser tab is added before show(), avoiding the flicker of RHI switching. Change-Id: I0aaa5a4128f089bfc9ef68d25cab44da78962eb6 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit d7e0fd5304ebdb12c6f809cdbcf8193b49b9ecd2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-131-4/+4
| | | | | Change-Id: I8ff5ac8f00e472890ed94f454e67516c0c145483 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix logic in bindViewAndDelegateItemMartin Negyokru2022-10-111-3/+9
| | | | | | | | | | | | Updating adapterClient is required to Bind correctly. Bring back old logic from 6.3. Fixes: QTBUG-105953 Change-Id: I8845948db379c24902df0dd2dad96982a1455531 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit e995556338da4d381c457ddd978440f5099af496) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Add the git repo URL for the Qt PDF examplesVenugopal Shivashankar2022-10-101-0/+1
| | | | | | | | | This should enable the readers to access the up-to-date example code. Change-Id: Ie62bdea39d1374b49f1b8f5bf576b27c8f37996f Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit a14c5924d26fa73624269e0d46f914a8ec3471da)
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-071-4/+4
| | | | | Change-Id: I16920380b4bf872cf92f8c79be48dbfd5f777044 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Stop using deprecated QMouseEvent constructorShawn Rutledge2022-10-061-2/+5
| | | | | | | | | | Followup to qtbase 6b2c9b81afdb3d1d9b7a2e87819e9545b14810f3 Change-Id: Ib879ee176c4fd1fc4bdbac7161ea20cf5c59a247 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 252456b94a93ddef2fdfdd49d59fc8f474fb5e80) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-061-4/+4
| | | | | Change-Id: I9d4b1ccaa4a73d8aa114dbb0500055dc8278c995 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Do not intercept websocket connection when there is no associated frameMartin Negyokru2022-10-031-2/+1
| | | | | | | | | | This fix is based on chrome's implementation. Fixes: QTBUG-107144 Change-Id: If042e4156b8a4bdb27a210c4db94e3a6198aed7d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 64b7da9dab82713fdcb2e03d8a2715421eae5685) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-10-031-4/+4
| | | | | Change-Id: Ia51cf6522d38267de3e32496d1e6e799995c15c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-301-4/+4
| | | | | Change-Id: I553f7901c3459698d203ce23dc1c59bf02efa113 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Note DNS prefetches can overrule remote access permissionAllan Sandfeld Jensen2022-09-291-1/+2
| | | | | | | | Fixes: QTBUG-106967 Change-Id: I0407258403ec3b76ce694e0f592fe57b4f45c746 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 6bd06fdb35f4ad973a2abaaa35b5c12cbca0d37a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-291-4/+4
| | | | | Change-Id: I54ba441b3ef9d3dc421a1eaef9d8b2dfa70c2705 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Try to pick up .rcc files as well in packagingAllan Sandfeld Jensen2022-09-281-1/+3
| | | | | | | | | Seems they are not matched by the ** syntax. Change-Id: Ibcabdc1d87d6d483e743efd3f6e5aa87df023d93 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 6f61a3a730e30a59e3c2e5d655699c5a04d84955) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-281-4/+4
| | | | | Change-Id: I1efe2562aaf40215ab8ea12dac53134d16438e49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix splittingAllan Sandfeld Jensen2022-09-271-2/+2
| | | | | | | | | | | Was missing some Pdf files in the pdf module Fixes: QTBUG-106944 Fixes: QTBUG-86972 Change-Id: I996a890ecd84ed6084f2075a98c4572372cba5ac Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit e401e26fb5db72cc79af56bea942409c1d044bf4) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-261-4/+4
| | | | | Change-Id: If34de4bf556f0af452715c1e74496034bf0e6cd0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QtPdf multipage example: add macOS icon; support QFileOpenEventShawn Rutledge2022-09-227-6/+88
| | | | | | | | | | | | The icon uses some parts from https://openclipart.org/detail/171857/icon-pdf-a%C2%8Dcone Task-number: QTBUG-106460 Change-Id: I94ecc81d83f96fdced3dce630b94b9037d3e90f9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 803e11fd787fc854e1e091f257ef97894e5729d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Work-around GNOME bug misidentifying HTML contentAllan Sandfeld Jensen2022-09-211-1/+4
| | | | | | | | | | | Correct application/x-extension-html to text/html Fixes: QTBUG-97392 Fixes: QTBUG-106688 Change-Id: I0d65c6950c5ba1504586cf564268463c5d4cd483 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 84ebd698597cf7a45b5e0967221547c21b1d67e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QtPdf multipage example: open files via DnDShawn Rutledge2022-09-211-0/+13
| | | | | | | | | | Drop a different file onto the window to replace its contents with a different PDF. Change-Id: I824d9f0caee69382352ab8d943b9977984db4fc9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit 0e3d03890442818b010ff763dccee4394c0430cf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix client certificate regression on LinuxAllan Sandfeld Jensen2022-09-201-2/+3
| | | | | | | | | | The system certificate store was never generated after the define switched to being a BUILDFLAG Change-Id: I2efa54bd397e2dde55c249747f73a9ffb08e80ea Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b6c1564c22332271c0a9473894200646efef4d50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-201-4/+4
| | | | | Change-Id: I828df3dd231e8df8e99e354e5e8c9e187101f9f5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-191-4/+4
| | | | | Change-Id: I972c591efbe3d05e6581784c0ce8ccb2c35b3cf2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: accept known valid 32 bit host architecturesRolf Eike Beer2022-09-191-1/+3
| | | | | | | | | | | | | | When trying to cross-build from one 32 bit host architecture to another the "Unsupported architecture:" case was hit, in which case the result of get_v8_arch() was empty. This would lead to configure_gn_toolchain() being called with a missing argument, which gave a totally unhelpful error message. Fix this by just accepting valid 32 bit architectures from the internal list, and raise the debug message to a FATAL_ERROR to get immediate feedback. Change-Id: I8e0c757ad13e2acff67827bd9063c493e9d84444 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3995d2fe81ae6affe9e37cc44e077617b9d480b3)
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-161-4/+4
| | | | | Change-Id: Ice9c8b19b294e5dcda6452770261acb1f9eac89c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.4.1Jani Heikkinen2022-09-161-1/+1
| | | | | Change-Id: Ic9372c7d3f361ef4eec4ac7d74ce5c460296e663 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix locally falling tst_qpdfdocument on qemuMichal Klocek2022-09-161-1/+1
| | | | | | | | | | | Use name for temporary file otherwise is can not be opened on qemu. Task-number: QTBUG-105342 Change-Id: I7f9ed244c32b866ead6832ed942e2293be24811b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 30f2d86426c674d0cba9ca88dbf7e587c57e72d3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Check QT_OPENGL for softwareMichal Klocek2022-09-151-0/+7
| | | | | | | | | | | | | According to qt docs this variable should have same effect like setting Qt::AA_UseSoftwareOpenGL on application, therefore read that in case of detecting the software mode. Task-number: QTBUG-106095 Change-Id: I00fa8f0607ca44533c445434d1a35a1524bab679 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit fd1e82d0c09c73e42f172ffdf7edbcc952232155) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-151-4/+4
| | | | | Change-Id: I94a0a144b0b8f8b16d82434a25b3d01e90701d97 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update ChromiumAllan Sandfeld Jensen2022-09-154-2/+3
| | | | | | | | | | | | | | | | Submodule src/3rdparty 82da2de9a..1dc53de69: > [Backport] CVE-2022-3040: Use after free in Layout > [Backport] CVE-2022-3041: Use after free in WebSQL > [Backport] CVE-2022-3038: Use after free in Network Service > Merge branch 'upstream-master' into 102-based > FIXUP: Trim down some dependencies of push messaging > Fixup partial application of macOS OpenGL pixel format selection patch Fixes: QTBUG-106254 Change-Id: Ifd55481c8d26f0e2cf8cb9e01cdaa8aa530354d8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit fbdb72b4981a9ec471756b5aac17376fe0a0c0d6) Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Avoid crashing with unparented accessibilityAllan Sandfeld Jensen2022-09-141-6/+6
| | | | | | | | | | | We do not get the automation id in this case then, but we have run without it before. Fixes: QTBUG-106588 Change-Id: Ib65f1aaff1d7ef260df56c7de7198b0679e0d644 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit a79afbeaa0d5a0fe1152c221c063cf8e7304ed73) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-141-4/+4
| | | | | Change-Id: I7d8442ebb8d227544fe0603399727cb18c6836c2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Make opengl module name check more relaxedMichal Klocek2022-09-141-1/+1
| | | | | | | | | | | | The module filename can be different depending on windows platform for example "openglsw32.dll", "openglsw32.DLL", "openglsw32". Make check more relaxed. Fixes: QTBUG-106095 Change-Id: I0abd5f61df2a44b395c8a81511e4d3bc807e1537 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit db4d4d1edae7351fab777d492ed1004eb293f27e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Coin: Add core count configToni Saario2022-09-131-0/+6
| | | | | | | | | | Reflects what has been configured in the Coin. Allows removing the rules from Coin and brings them visible. Change-Id: I377333a4615af0844dc70eeccb7f2ed79fb30103 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit e55fc5c7e23663e057408a587df2d9d0d5b99c68) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-131-4/+4
| | | | | Change-Id: I768cf1cb7e92009726d97b709bde4d419726a545 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Use delay load for media foundationMichal Klocek2022-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | We should delay some dll loads as MediaFoundation is not available on Windows N. Chromium already uses that option when compiling components, however we use only response file to track dependencies, and those libs were never linked with DELAYLAD flags by (qt)cmake. There is currently no nice way to set those base on gn dependencies as those are generated on bulid time and we need linker flags on configure time. As workaround simply hardcode those 3 required libs, as side effect when linking QtPdf module there will be warning that there are no references to mentioned media foundation libs. Fixes: QTBUG-100391 Change-Id: I06e4bffdf8bc6803a4f2b1437679628b9a733299 Reviewed-by: Michael Brüning <michael.bruning@qt.io> (cherry picked from commit 74163a6511278fa8273ca931ffdf9b9b3a8daae6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix using QNetworkReply with custom url schemesAllan Sandfeld Jensen2022-09-132-8/+60
| | | | | | | | | | | | | | Sequential QIODevices are allowed to report atEnd() when they have no data to read, but add more data later. To avoid a regression with our own tests, treat a read error from a sequential device at end, as end-of-data. Fixes: QTBUG-106461 Change-Id: Iac1233e6daa978c827c37a7fd3131e2fce764111 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit aefd389bfdf7efcaf787d2cfb4683d7018cb377c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-121-4/+4
| | | | | Change-Id: Ieff88e7046b01a10507ef09b176aabba3b2fb1c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix busy waiting on streaming QIODevice'sAllan Sandfeld Jensen2022-09-101-5/+6
| | | | | | | | | | | The writable watcher will trigger all the time if we use automatic arming, instead we need to arm it manually when it is needed. Task-number: QTBUG-106461 Change-Id: Ia381db338adb1b1994d1da9b50c6d6ff542ea3e5 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit b30559565cb91501baddea495362101341a0aa22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove qLcNav logging category from qquickpdfpagenavigator.cppShawn Rutledge2022-09-101-2/+0
| | | | | | | | | | | It's not used in QQuickPdfPageNavigator, and causes a linker warning about a duplicate symbol, especially in static builds. Fixes: QTBUG-106361 Change-Id: I128c10a1aead1aa9a761dc091c626488fc195d12 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 1d98fad6ea411a00812d52bb7119f651b499d7a9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PdfSelection: mark read-only for IM to avoid showing virtual keyboardShawn Rutledge2022-09-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | The Qt::ImReadOnly query enum is new in 6.2 (qtbase c80f262258b7846bf199887bcfdbb6dcfda6ad6f and aae4d52cbb79c61161271473ab5c3a1ba1086e01). It was added to the switch statement in 79d04aa9e3e9aa84d7378260519f9e9a6759dc41 but needs to return `true` to mark this Item as read-only, so that the keyboard will not open when it gets focus. The menu still gets populated with Select and Select All on long-press, and then Copy after a selection is made. That's all we need. The qt_im_readonly property was a sort of private API for Qt 5, and should no longer be needed (albeit the implementation is still in Qt 6 so far). Task-number: QTBUG-83811 Fixes: QTBUG-106358 Change-Id: I677363be545d07884dffdfc10d6fdbd488cf2cf0 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit b37d29b5f3c3572c6f3348545d23d8e42362311c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix typo in CMakeList.txtMichal Klocek2022-09-091-1/+1
| | | | | | | | | | | | | Fix typo, which slipped through testing. This covers the case when gn is already built (external project) and user reconfigures qtwebengine after removing cache (for non-prefix build) Task-number: QTBUG-106406 Change-Id: Ic0d105ff7d50a07f3729cb0cd095d2a8daf6911b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 08692e7d628e56e34fdc84e9da574d78ce8ecf1d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.4' in qt/qtwebengineQt Submodule Update Bot2022-09-091-4/+4
| | | | | Change-Id: I62d304916862f74e061070a1791ed261b5db3861 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Polish the QML/PdfViewer exampleFriedemann Kleint2022-09-082-8/+21
| | | | | | | | | | | | - Use QCommandLineParser - Use QmlEngine::setInitialProperties() instead of context properties and make "source" a required property of type url - Use startup documents from resource Change-Id: Idaad82be4d7cf862de96240af031ed317a401266 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit c11b0bab0172c166b66dc4ee961b1236e1ebd4ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Polish the nano browser exampleFriedemann Kleint2022-09-0810-30/+54
| | | | | | | | | | | | - Use QCommandLineParser - Fix the organization name - Use modern QML type registration (Utils as a singleton) instead of context properties Change-Id: Ibbe93dffd685ddd2e5f2d01852e006c4c47d9713 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 98bae072c090ee19e2a5a1e85eed712a060d12fc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Polish the PdfWidgets/PdfViewer exampleFriedemann Kleint2022-09-083-9/+33
| | | | | | | | | | | - Use QCommandLineParser - Fix up QFileDialog handling - Small fixes Change-Id: I0cbe30a0fb5c856805956970407aa526d1d93fa4 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 1124186319bc4f9a395ba631b769e9bff5e08fe9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>