aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* DropArea: Tell qdoc that DropArea indeed inherits ItemFabian Kosmale2021-06-141-0/+1
| | | | | | | | | | | This ensures that we list all of Item's properties in the "List of all Members" page. Change-Id: Ide7e270fd187e6adc4a20b70b8ef84d2c25a836c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 565290ef3b63fd6ac7b3eac06e64c6a09a2561ad) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-06-141-2/+2
| | | | | Change-Id: I0edc6ef8a1241b8443c0c876dd30ef8c92ca806f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-06-121-2/+2
| | | | | Change-Id: I67fe01c3f1fb6af65dcdfe882b303dd35fb183b4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-06-101-2/+2
| | | | | Change-Id: I67d19d7431989ee823513136e800776ec9d51e49 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump versionJani Heikkinen2021-06-082-2/+2
| | | | Change-Id: I487ae3482e9b2c51b6b36db1dff66107e5b11bab
* Don't let PointerHandler steal mouse grab from keepMouseGrab layerShawn Rutledge2021-06-013-8/+105
| | | | | | | | | | | | | | | As explained in the comment, the handler can override the keepMouseGrab "veto" if the item is a parent (like a Flickable) that filters events, but not in other cases. The logic was wrong though, apparently. Amends 090f404cf80da35734f712b02cc1543acecd5b62 Fixes: QTBUG-78258 Task-number: QTBUG-79163 Change-Id: I9a473ab3b23743f863cb0be13767fdbc29cd5e1c Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit b09ce7dcd8ecf24ef23da8197a64e3fced3fc894)
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I7db53deafab8c09cdca362cec7c25713aca6e8bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-06-011-2/+2
| | | | | Change-Id: I745a9ef33e4b32c757a8cd1bc1a055a543e5e8ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: Ib33ac5267ca7bad50ab0400cd2473657c05ee549 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I18c672a835dac57b3b666c36f1df7bb5b7f771dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-311-2/+2
| | | | | Change-Id: I876b9be59519581930e21567ef57152491465ca9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Document handling signals with parameters in QMLFabian Kosmale2021-05-281-1/+52
| | | | | | | Change-Id: I1fb2a6b744ee1bbef2ceceba119bc8d4bc882144 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit a678309dfd132e1b34662c72b8d8d8515e2826d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Support &apos; in styled textAlbert Astals Cid2021-05-282-1/+3
| | | | | | | | | | Includes the doc fixes from 5848c081c094a66e024493fc1e5c2569e06f73b6 (that had not been marked for backporting to 6.1) Change-Id: I4a8db963e52a7899ab1796f9a560e8029cc1c929 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 96b528efcba1226d2980828d1255160bdceae4cf)
* QV4StackFrame: Fix ubsan warningFabian Kosmale2021-05-281-1/+3
| | | | | | | | | | | Calling memcpy with a nullptr is UB, even if we copy 0 bytes. Add a null check to avoid the issue. Fixes: QTBUG-94067 Change-Id: I1d47424754e22f13d7b494ae984b4407b96b1805 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 0b10b83dad91b44559b9f4ddcf9d8bed5544de93) Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix MSVC warning C4334Kai Köhne2021-05-281-1/+1
| | | | | | | | | qquickparticlesystem.cpp(217): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) Change-Id: If17ecb2003995d54fce4e0ed58c8e2b183928dc3 Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit ff8392d4ba28ebd6cb2eef584773a75aa8382392) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: I55479c2ac5de9e555dfe1281457888270619f4bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-281-2/+2
| | | | | Change-Id: Icbd59941b332662a588afabad840db897301cc3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix MSVC warning C4065Kai Köhne2021-05-271-5/+2
| | | | | | | | | | qsgdefaultcontext.cpp(308): warning C4065: switch statement contains 'default' but no 'case' labels Change-Id: Ic050d21549cb3eeabade803a23e3e9eb202e3a74 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 0bdbfb9589ce912afbecc6fd3408f8320d78de10) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Keep DragHandler active while dragging even if other event happensFabian Kosmale2021-05-273-1/+115
| | | | | | | | | | | | | | | | | QQuickPointerHandler::handlePointerEvent() calls setActive(false) when wantsPointerEvent() returns false (except for a NativeGesture event), for the sake of deactivating reliably when it receives an event which it does not handle. Now we need one more exception, because it's not what we want in DragHandler while dragging: If we get a wheel event, that should not interrupt the current drag operation. Thus, we change the logic in wantsPointerEvent to consider even events we wouldn't normally handle while the DragHandler is active. In handlePointerEventImpl, we then simply ignore them. Fixes: QTBUG-91549 Change-Id: I24e8bd890a21b244c9964f4df76986688085fa87 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 40bbf1e8fddebb0974426a03b0f48dfc08f942de)
* Emit grabChanged() from DragHandler and PinchHandlerShawn Rutledge2021-05-273-1/+27
| | | | | | | | | | | | Followup to ca7cdd71ee33f0d77eb6bf1367d2532e26155cb2 : when overriding a virtual function, it's good practice to call the base class function, in the absence of any reason not to. Fixes: QTBUG-93880 Change-Id: Icbd04faec51d55d8fbf73319bd20f5846761d3d5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit a10eeee97d42f05409074f69cc99d9a8da5db077) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-271-2/+2
| | | | | Change-Id: Ifac36809c1e8a7fd3c097a6d4e1b9b13c7f9c6fe Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Doc: Generate FolderListModel documentationTopi Reinio2021-05-261-1/+2
| | | | | | | | | | | | src/labs/folderlistmodel was not part of any documentation project after the source directories were moved. Fixes: QTBUG-94022 Change-Id: I61c31ff0e05f1bafdfe897556ecd167a5bcaba61 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit e2f247fafcd90c02e5db686c791ff4818be9cc50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Restrict types from unversioned imports only by major versionUlf Hermann2021-05-263-1/+29
| | | | | | | | | | | | | | | | | The versionless import tells us that any version of the type is allowed. We still record the major version because types have to be re-registered for each major version. Any minor version belonging to that major version is allowed, though. Restricting by minor version has the effect of passing the minor version of the "host" type into grouped property accesses. This is certainly unwelcome as the grouped type can have a higher minor version than the host type. Task-number: QTBUG-33179 Change-Id: I73f0f4fdaa00ac13cf91a4c21fd705c9dba070ec Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit 5ca899164156ee49770ef3749e6d4b1567c00362) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* mingw: Skip segfaulting testsOliver Wolff2021-05-251-0/+15
| | | | | | | | | | | | | | QQuickDesignerSupportProperties::registerCustomData segfaults on mingw. Due to these segfaulting tests, mingw is marked insignificant at the moment. In order to get at least some test coverage for this configuration, the tests are skipped for now. Task-number: QTBUG-90869 Change-Id: I75c61b83c53e038be4dc518bf39955f477d381ee Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 9184f6c1de2c315cc66eb6cd3886c3daea90516f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-241-2/+2
| | | | | Change-Id: I196f07945f604c39c55beceac5ba76b1bbde7f08 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing limits include to fix build with GCC 11Antonio Rojas2021-05-231-0/+1
| | | | | | | | | | | | This is not required for Qt 6, since it is indirectly pulled via qanystrigview.h, but it is for Qt 5 (where qanystrigview does not exist) and, in any case, it is good to declare all used headers and not rely on them being implicitly pulled. Change-Id: I97606ea493e723006759608b7d4c4f00632f340c Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> (cherry picked from commit 367293b18ab0d0a0432c1c8ce445fee052e5eee5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use build time shader compilation in lancelot testsEirik Aavitsland2021-05-2290-475/+246
| | | | | | | | | | Clean up the remains of Qt 5 shaders, and use the simpler Qt 6 way of adding shaders to the app. Change-Id: Ibbdf7ada899507705a2709913410b24d476d25d3 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 0b1c7c95e08d1ef0165ff9237c194cfcebdcefce) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Give a warning when StyledText encounters a non supported entityAlbert Astals Cid2021-05-211-0/+4
| | | | | | | Change-Id: Iea8bdf25542cd404ee71141467ac1f1398a7d0df Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 8cd43e370040e23fcbd03ad64969e683055bd7d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Window can be imported with import QtQuick nowMitch Curtis2021-05-211-3/+3
| | | | | | | Change-Id: Ifea27b5906bf9dcc3087946aaf8bd3aed968309b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit be74a0082c4b9f6fc3b700ea2c9689bfcb5d1433) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unplugged device in knownPointingDevices listSiyeon Seo2021-05-211-0/+2
| | | | | | | | | | | When the visible value of qquickitem is changed, a crash occurs while accessing the physically unplugged device information from the knownPointingDevices list. Change-Id: I7f3190bc47ef068ca3d795216eedd6377fa25120 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit b567c3836b518c69a1a3d11dfdc36f7c5742f2b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-2131-2252/+608
| | | | | | | | | Fixes: QTBUG-93849 Task-number: QTBUG-86726 Change-Id: If6e1033642d98ccd40daeb57a453c0e5bc2985da Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 1917a868d9bbd6c916e2a54cad6ad28780f73f34)
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I28b2352bbaaeddc12fce9bc5e607679fe38d8ecc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Don't dereference node unless it is actually assignedVolker Hilsheimer2021-05-201-3/+2
| | | | | | | | | | | | While the static analyzer doesn't see in 727c503c234d162fb8d62b1aadf328de that node must never be nullptr when i == 0, the statement doesn't have to be executed at all if the previous block wasn't run as well to assign node. Change-Id: I2edd901674e7603a317ebdf98dd4800b768a0a5b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit afb081115d05c010aa4c80c985f69f8f333264c7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add Q_ASSERT for _context pointer to pacify code checkerVolker Hilsheimer2021-05-201-2/+21
| | | | | | | | | | | | | The pointer is initialized to nullptr, set in enterEnvironment, and possibly reset in leaveEnvironment. The static analyzer can't know that it is always set before any of other functions is called, so assert that pre- condition via Q_ASSERT. Change-Id: I0198505db40a93227ba52a08c29a351e85b74cc0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> (cherry picked from commit ae1334d827bd386ae34ed5fca8f00dcef83bc65e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Set a11y role for QQuickTextInput to EditableTextMorten Johan Sørvig2021-05-201-0/+2
| | | | | | | | | | | Extend the current special case handling for text items to also handle QQuickTextInput. Task-number: QTBUG-93599 Change-Id: I5c0393e5d34a8bce2c6a2cbf491c6d3cad3ff294 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io> (cherry picked from commit 94f34ef69bda1378471c0e39bd354b99179dbb0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-201-2/+2
| | | | | Change-Id: I7dfce8d50e27003f98dcf9e1a26933878aa06a84 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enable rendercontrol_d3d11 example for MinGWLaszlo Agocs2021-05-197-15/+8
| | | | | | | | | | Fixes: QTBUG-92839 Change-Id: Id17417b7ae010566b7f78ea1a6b2cc8fe6abc5e3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io> (cherry picked from commit aab39f5d5dc7d960715d5335a2427e89a6ce0f0d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove tst_pixelMitch Curtis2021-05-193-78/+0
| | | | | | | | | | | | | Future patches will add uses of pixel() and other accessors to selftests/tst_grabImage.qml, and that's where those kinds of tests should be. Task-number: QTBUG-27671 Change-Id: I3ad42ded144cb7fa8b196a3ac58abcd9ee9b2abf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexander Akulich <akulichalexander@gmail.com> (cherry picked from commit 1d1910e70778114e5eae586792664cf6c0997ed0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Switch from QFlatSet to QSet in particlesKaj Grönholm2021-05-194-161/+2
| | | | | | | | | | | | Based on testing, when the amount of particles increases, Qt 6 QSet seems to perform better in this use case than the QFlatSet. Task-number: QTBUG-92977 Change-Id: I442a8fb7a0496f6ee7e5c4fc37348f549f81a686 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 6f1ed8b46abed1a2190c12f8d7b272b075efa0e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-191-2/+2
| | | | | Change-Id: I7ff1bdd726cd5b86cde998668e6f7f451890d814 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I8ed0f26352740b6eede7010359c07a84242c7553 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix the qmlscene command help messageJiDe Zhang2021-05-181-1/+1
| | | | | | | Change-Id: Ie957bcc459a91d1c353be664074475545ec67510 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 9dba08d048f612378c97f276ce69148a0b225b0b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I32700f66bd9eb7f5524dbbcb6050e42f4c597f48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-181-2/+2
| | | | | Change-Id: I85777b29ec268a50eea6c4ee4f058d104fdf3bb7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Enhance approveGrabTransition log messageShawn Rutledge2021-05-141-2/+3
| | | | | | | | | Show the existing grabber, not only the proposed grabber. Change-Id: Idd1b41f96b063793c3c97aa67aa4425e2d58a027 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 2ae029e00bf4a0403aaeb24cbdcdfb0881b855e6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Blacklist tst_QQuickGridView::snapOneRow for Win 10 MinGW developer buildHeikki Halmet2021-05-141-0/+1
| | | | | | | | Task-number: QTBUG-88644 Change-Id: I0fdaa7d8d527dcb4c22c54e7d1004ee02c5e241c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit f3ed98bf09885795de160468fd615c9e07d5ed5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QQmlListAccessor: Store integer if m_type is IntegerFabian Kosmale2021-05-141-0/+1
| | | | | | | | | | | | | | | | | When we pass a QVariant to QQmlListAccessor::setList which contains something convertible to a number, we set the type to Integer. Later, we simply return whatever is stored internally in the variant, and cast it into an int. That goes horribly wrong if the variant actually contains a floating point number. To fix this, we now store the actual integer in the variant after the checks are done. Change-Id: I3aa173a1558e95361bb4b19e97542d8a435a6dd7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 42afb8249cfcf8cec66aac9e55d13ac508699ec8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: I75c265a4c1343c5b7f948d7157acc5c549bbd2dc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.1' in qt/qtdeclarativeQt Submodule Update Bot2021-05-131-2/+2
| | | | | Change-Id: I8f7126fe973c6fdd6e942e76130fe9578460f5e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Don't stop delivering to subscene deliveryagents after point acceptedShawn Rutledge2021-05-121-2/+0
| | | | | | | | | | | The qtquick3d test tst_Input::dualTouchTap2D got broken by this. Amends 5c08e911375966761ee8e4d7cd425120985876e2 Task-number: QTBUG-92944 Change-Id: I8b955029e9075204a8c8d5899eb2c9f516649f84 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 01069b8514dedb4e1f8f90a9a2c79bc064a63076)