summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v5.15.13-lts-lgpl' into 5.155.15Tarja Sundqvist2024-03-084-7/+30
|\ | | | | | | Qt 5.15.13-lts-lgpl release
| * Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into ↵v5.15.13-lts-lgplTarja Sundqvist2024-01-044-7/+30
| |\ | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9930e59e2e8e2070f4e1db433aaed250fabc903b
| | * Document Third-Party Code changes in 5.15.13Tarja Sundqvist2023-02-221-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.13 and Qt 5.15.12 checkouts, and diff'ing these. Task-number: QTBUG-109891 Pick-to: 5.15 Change-Id: Ie34d3231d1d9b8e374a18e9ae3f06122f3832fb2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Docs: Update JDK requirements to 11 or laterNicholas Bennett2023-01-162-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed "earlier" to "later" on the android getting started page and the building Qt for Android page. Fixes: QTBUG-110064 Change-Id: I92efce99dc8c906a3bbbee74a3c9de19e0bc7e9d Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Tero Alamäki <tero.alamaki@qt.io>
| | * Bump version to 5.15.13Tarja Sundqvist2022-12-221-1/+1
| | | | | | | | | | | | | | | Change-Id: I8c2a59c3160e4acc9072e77ce7510d2cb0115a24 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Document Third-Party Code changes in 5.15.12Tarja Sundqvist2022-12-071-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.11 and Qt 5.15.12 checkouts and diff'ing these. Change-Id: I5c0fa2d307632972b443350c38086b45a836e93b Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1939ffaa00d5e0b47080127a73c382e199070101) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | | Merge tag 'v5.15.12-lts-lgpl' into 5.15Tarja Sundqvist2023-12-206-12/+17
|\| | | | | | | | | | | Qt 5.15.12-lts-lgpl release
| * | Merge remote-tracking branch 'origin/tqtc/lts-5.15.12' into ↵v5.15.12-lts-lgplTarja Sundqvist2023-10-116-12/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I9ce6e3a31ad7f296e7272e7c775e1a031b2ff627
| | * | Document Third-Party Code changes in 5.15.12Tarja Sundqvist2022-12-071-0/+14
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.11 and Qt 5.15.12 checkouts and diff'ing these. Pick-to: 5.15 Change-Id: I5c0fa2d307632972b443350c38086b45a836e93b Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix typo in 'why moc' documentFabian Kosmale2022-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-107245 Change-Id: Ia7eed02b5eff293a3d650e6bae6bdbf01a7acfe9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit b04a538b0e48760bcb3425f72bc2b082f5a5e138) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Doc: Consolidate information about SSLKai Köhne2022-10-063-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 5.15, we only support OpenSSL 1.1.1 or later. Change-Id: Ifc0066767a2bec40dcce7b68bcbdfee2944eb7d9 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit aead590843909462686204feb68c76744a3b7e47)
| | * Bump version to 5.15.12Tarja Sundqvist2022-10-061-1/+1
| | | | | | | | | | | | Change-Id: I15c68b962f8688083570bdce1f02610ce9e1a392
| | * Document Third-Party Code changes in 5.15.11Tarja Sundqvist2022-09-271-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.10 and Qt 5.15.11 checkouts, and diff'ing these. Task-number: QTBUG-104280 Change-Id: I2102793532a4db9fd85093f5096fec50444cc568 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 2456728af8c3a304cf3da369a9cce92f249425c0) Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
| | * Update supported platforms and compilers for lts-5.15.11 branchHeikki Halmet2022-09-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-104281 Change-Id: I8c0e7629927f6e65afe62d818afe7087bd918d05 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> (cherry picked from commit d75b7a1b89236cb82d50c79af1945ef1512a6c5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | | Merge tag 'v5.15.11-lts-lgpl' into 5.15Tarja Sundqvist2023-10-045-19/+65
|\| | | | | | | | | | | Qt 5.15.11-lts-lgpl release
| * | Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into ↵v5.15.11-lts-lgplTarja Sundqvist2023-06-095-19/+65
| |\ \ | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I51ba85eed12d346d8d51861cb2ef0f43ce572ef2
| | * | Document Third-Party Code changes in 5.15.11Tarja Sundqvist2022-09-271-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes where obtained by running qtattributionsscanner -output-format json in the sources of both Qt 5.15.10 and Qt 5.15.11 checkouts, and diff'ing these. Pick-to: 5.15 Task-number: QTBUG-104280 Change-Id: I2102793532a4db9fd85093f5096fec50444cc568 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Update supported platforms and compilers for lts-5.15.11 branchHeikki Halmet2022-09-261-0/+4
| | |/ | | | | | | | | | | | | | | | | | | Pick-to: 5.15 Task-number: QTBUG-104281 Change-Id: I8c0e7629927f6e65afe62d818afe7087bd918d05 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Fix a typo in Qt versionTarja Sundqvist2022-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | The supported Qt version should be 5.15.10, not 5.5.10. Change-Id: I122170a34efbe0178bec7f98b72ab3df9620dd25 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Update supported platforms for Qt for VxWorks 5.15.10Tarja Sundqvist2022-08-311-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-105994 Change-Id: I8645348cc0ee386aedb3b62d6b368bba963489e7 Reviewed-by: Dominik Holland <dominik.holland@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 306d36023e058c1f0cc2f1b1ff4ce886926f26ce) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Update supported platforms and compilers for 5.15.10 releaseHeikki Halmet2022-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-102506 Change-Id: I40be34fb6cbecfcc95ee5b566fbeed3aa2a05be2 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> (cherry picked from commit faa7766f4090a30fefd600e8cbb8395fe469f203) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Bump versionTarja Sundqvist2022-06-151-1/+1
| | |
| | * Clarify that the CI does not define the reference configurationsTor Arne Vestbø2022-06-141-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For various reasons, not all reference configurations are tested in the CI, but may instead be tested day to day by developers, and manually as part of the release process. By removing the CI references in the documentation we make it clear that the CI does not define the list of reference configurations. Change-Id: Ie16dd23afe5cae9d0a67a216cd113ab3c3ca10ec Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit ce554b6313bac4b760bbced03b113d8cb4803ce3) Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * Doc: Add Qt PDF to add-ons listAndreas Eliasson2022-05-311-0/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-103303 Change-Id: Ic509dd2ec3c26c1c3c69b8804e031abeb444031b Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Document third-party code changes in Qt 5.15.10Tarja Sundqvist2022-05-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributinsscanner -output-format json in the sources of both Qt 5.15.9 and Qt 5.15.10 checkouts, and diff'ing these. Change-Id: I933f0a00dfdbfdad6419524b64598df588d49e97 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 092dbf9661277cb30b922869bdf3775d7afcd5cf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | | Merge tag 'v5.15.10-lts-lgpl' into 5.15Tarja Sundqvist2023-06-067-45/+53
|\| | | | | | | | | | | Qt 5.15.10-lts-lgpl release
| * | Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into ↵v5.15.10-lts-lgplTarja Sundqvist2023-04-248-56/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I75bc374ac8ab284d6c0b046cb7c7ea2a2da82710
| | * | Update supported platforms and compilers for 5.15.10 releaseHeikki Halmet2022-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pick-to: 5.15 Task-number: QTBUG-102506 Change-Id: I40be34fb6cbecfcc95ee5b566fbeed3aa2a05be2 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| | * | Clarify that the CI does not define the reference configurationsTor Arne Vestbø2022-06-141-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For various reasons, not all reference configurations are tested in the CI, but may instead be tested day to day by developers, and manually as part of the release process. By removing the CI references in the documentation we make it clear that the CI does not define the list of reference configurations. Change-Id: Ie16dd23afe5cae9d0a67a216cd113ab3c3ca10ec Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit ce554b6313bac4b760bbced03b113d8cb4803ce3) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * | Document third-party code changes in Qt 5.15.10Tarja Sundqvist2022-05-251-0/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributinsscanner -output-format json in the sources of both Qt 5.15.9 and Qt 5.15.10 checkouts, and diff'ing these. Pick-to: 5.15 Change-Id: I933f0a00dfdbfdad6419524b64598df588d49e97 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Android: add android:exported to the service and receiver declarationAssam Boudjelthia2022-05-041-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this tag is not present there might be warnings or the service or receiver might not work as expected. Task-number: QTBUG-101320 Change-Id: Iec9846ab91922339d10d8d771cbe4a9dcd151241 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit df382350d4c10dbd28237d192af8d4495d8aae14)
| | * Link up the information about categorized logging betterShawn Rutledge2022-04-282-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The use of logging categories in console.log was far too obscure relative to its usefulness. Most reusable QML components and most applications could make good use of it, routinely. Likewise Debugging Techniques didn't mention categorized logging, only the older macros. Debugging Techniques now links to Debugging QML Applications and vice-versa, and both of them link to the LoggingCategory QML object. It's good to have more info in QT_MESSAGE_PATTERN. Since we stopped pasting qFunc() all over, it's good to have %{function} (even though it goes missing in release builds); and I think %{time process} is a great way to see message timing. %{type} and %{appname} make the output too long for my taste, but my usual %if syntax for the type is too verbose to put here; and %{appname} was already here for some reason. Link to QQuickItem::dumpItemTree() alongside the paragraph about QObject::dumpObjectTree() and friends. Change-Id: If1d1168ee85a82eb63a533da016c47f032f385c2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 468529bed05abb595ae82e9b15707867b825d9eb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Doc: Update documentation on trademarksTopi Reinio2022-04-261-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add information about trademarks owned by The Qt Company and remove obsolete trademark remarks. Fixes: QTBUG-102787 Change-Id: I6f158f83e7327340303e0b73da16c5cb2234284a Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit 4e7f9f6006213e5dcddd4b9db986b475ec4c7790) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Add information of the updated zlib versionTarja Sundqvist2022-04-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The zlib version was updated to 1.2.12. Change-Id: I572be7b59e25c5bf0f04bc079533c64f26a0608d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 56249c28d75acc1ede2ed12a9b4497925194c88d)
| | * Bump versionTarja Sundqvist2022-04-061-1/+1
| | |
| | * Document third-party code changes in Qt 5.15.9Tarja Sundqvist2022-03-221-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributinsscanner -output-format json in the sources of both Qt 5.15.8 and Qt 5.15.9 checkouts, and diff'ing these. Change-Id: I6060df23bbedceaa8f12cb9e1a463dce439c9274 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit cd0c6a6b68ddad7b3fae9fb1edbb1a81c372c659) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* | | Merge tag 'v5.15.9-lts-lgpl' into 5.15Tarja Sundqvist2023-04-0514-55/+106
|\| | | | | | | | | | | Qt 5.15.9-lts-lgpl release
| * | Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgplTarja Sundqvist2023-03-2314-55/+106
| |\ \ | | | | | | | | | | | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ic581f3373c78cc49dd0d75f67f65bf4debd049a9
| | * | Add information of the updated zlib versionTarja Sundqvist2022-04-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The zlib version was updated to 1.2.12. Change-Id: I572be7b59e25c5bf0f04bc079533c64f26a0608d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Document third-party code changes in Qt 5.15.9Tarja Sundqvist2022-03-221-1/+19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributinsscanner -output-format json in the sources of both Qt 5.15.8 and Qt 5.15.9 checkouts, and diff'ing these. Pick-to: 5.15 Change-Id: I6060df23bbedceaa8f12cb9e1a463dce439c9274 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * macOS: Update docs for specifying build architectureTor Arne Vestbø2022-03-141-7/+14
| | | | | | | | | | | | | | | Change-Id: I60c8ba70030bf4449eeb4983c8ec570cdf31b228 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| | * Update supported platforms and compilers for lts-5.15.9Heikki Halmet2022-03-141-5/+13
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-99909 Change-Id: I07a4e40e55b8e716f78205cad265b943170f161c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * Remove version number for Qt VS Tools supportLeena Miettinen2022-02-181-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The link in the paragraph leads to the latest information, so we should not have to maintain it here. Change-Id: I8d5c73fe8ab479af0027970d8f3aef72d5a9bdb2 Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit c4aa05647ae20b2a9ddbf72d412c02646fcb52b8) Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Fix alarms demo to run successfullyAlexandru Croitor2022-02-083-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it failed with QQmlApplicationEngine failed to load component qrc:/alarms/main.qml: No such file or directory main.cpp was adjusted to use alarms/main.cpp but the resource file locations were not changed. Change them to match the expected path in main.cpp. qtquickcontrols2.conf needs to stay in the root of the resource path, so it's added via a separate resource. Amends 302121874ea6e664ea2a59a07bff8fa06983c335 Fixes: QTBUG-100434 Change-Id: I3436e07600ca7dad8bba45274ba49dc6c137a938 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> (cherry picked from commit c43d133e5233415260afbed78f7cda8b4dec680c)
| | * Update Qt Quick GS tutorialLeena Miettinen2022-01-244-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update information about and screenshots of Qt Creator New Project wizard template. - Use the main.cpp file generated by Qt Creator 7.0 Fixes: QTBUG-99847 Change-Id: I1c2208267e9554e2f929ffffaa3dabd5554fc12e Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 302121874ea6e664ea2a59a07bff8fa06983c335) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Docs: add color attribute to Property BindingYe ShanShan2022-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unable to see the two children rectangles within the property binding example without color, so add color attribute to Property Binding example for easier readability. Fixes: QTBUG-91543 Change-Id: I5d7f316898a89dcc99f047b865cea88252fb820e Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit d4999d2dbafbc88ed1d856b129f2596bee4e9df0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Bump versionTarja Sundqvist2021-12-311-1/+1
| | |
| | * Add Open Asset Import Library version numberTarja Sundqvist2021-12-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-98203 Change-Id: Id3b50042f5d77187588bcaab2619e2fbb35194c3 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit 64fdbc43346dc75c3bb97f9e9e41cbba0019797f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| | * Docs: Add QNX 7.1 informationMarianne Yrjänä2021-12-221-12/+13
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-97907 Change-Id: I0e98415f549cfb55e24ae82300e2a30ccf348091 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
| | * Document third-party code changes in Qt 5.15.8Tarja Sundqvist2021-12-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The changes were obtained by running qtattributionscanner -output-format json in the sources of both Qt 5.15.7 and Qt 5.15.8 checkouts, and diff'ing these. Change-Id: Ice16e888c32e6ace5c7bd2af27b64beae146f7df Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit cd61e094112f3539b376d37705c18f8b28646bdf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>