summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Revise Qt Sensors module landing pageAndreas Eliasson2022-03-151-54/+35
| | | | | | | | | | | | - Use new global .qdocinc snippets - Change tables to lists - Rearrange sections to align with defined template structure Task-number: QTBUG-100369 Change-Id: I5118af7fb82378af3cf9d5db1cb8e651f01a08d1 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit 97ecf87e6f050eba61e4278014a22db2768631be) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make geomagnetic mode the default magnetometer behaviorTamás Martinec2021-12-232-2/+2
| | | | | | | | | | | | | | | | Geomagnetic mode uses the iOS API that results in similar values on Android and iOS, therefore this should be the default magnetometer behavior. [ChangeLog][QMagnetometer] The default magnetometer behavior is changed to be geomagnetic mode. Task-number: QTBUG-98978 Change-Id: I672c4f3b52c187da8c644e7f20f45dcd740b04b0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi> (cherry picked from commit 233475da20b420e82be4543e74a4a89a6999126d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QmlSensor: add missing #include <QProperty>Marc Mutz2021-11-291-0/+1
| | | | | | | | | It's not longer transitively included by qobject.h Fixes: QTBUG-98737 Pick-to: 6.2 Change-Id: Ib6eb90926b0c504de20b279d15c06b5adda7e1d5 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Doc: Replace use of \oldcode-\newcodeLuca Di Sera2021-11-251-2/+8
| | | | | | | | | | | The command-pair was recently deprecated. The replacement code should produce an output that is equal to the previous one. Task-number: QTBUG-98499 Change-Id: I9e0d696b409cbb319afc3fc3b088eadf3815e443 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* QSensorGestureManager: fix buildThiago Macieira2021-11-231-1/+1
| | | | | | | | | There was one more after 44a99bb1ba89f959ad98abf6a7399381675358fd. error: conversion from ‘QList<QPluginParsedMetaData>’ to non-scalar type ‘QList<QJsonObject>’ requested Change-Id: I89446ea06b5742efb194fffd16b9ffde07d33f04 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
* QtSensors: Implement iOS pressure sensorTamás Martinec2021-11-175-1/+181
| | | | | | | Task-number: QTBUG-70877 Pick-to: 6.2 Change-Id: Ibff63b412a1cc5a8234d3c7600ec70a717acab7d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Enable zero qdoc warning limitVenugopal Shivashankar2021-11-111-0/+3
| | | | | Change-Id: Iec8e3b84939776d1f8753d7ba2389add115a1110 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix qdoc warningsVenugopal Shivashankar2021-11-1118-35/+35
| | | | | | | | Drop \instantiates entry for QML types that use a private C++ implementation. Change-Id: I9e5cc3365fa28351537118e9062341922896bcb6 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Migrate to autogenerated cpp exportsAlexey Edelev2021-11-084-30/+5
| | | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Task-number: QTBUG-90492 Change-Id: I32a7f4aacbba1de145ba295df14d38fa39514eab Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Plugins: Port to QPluginParsedMetaData and CBORThiago Macieira2021-11-021-1/+1
| | | | | | | | | QFactoryLoader now no longer converts its internal metadata to JSON, so we may as well not do it here either. All of this is internal API, so we can change. Change-Id: I3eb1bd30e0124f89a052fffd16a6f2d82ad568af Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* CMake: Bump almost all cmake_minimum_required calls to 3.16Alexandru Croitor2021-09-222-2/+2
| | | | | | | | | | | | | Needed for subsequent change that will check and error out if the version is lower than 3.16. We do that to ensure all policies introduced by CMake up to version 3.16 have their behavior set to NEW. Pick-to: 6.2 Task-number: QTBUG-95018 Change-Id: I51ba79ad25f77c6989acb0cb471967b6403c96f2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Doc: Remove unsupported customFiltersKai Köhne2021-09-031-3/+0
| | | | | | Task-number: QTBUG-95987 Change-Id: I7e8deeec4c34fae02623fc4bf8f8fc395debf0f6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Remove linux sysfs backendJuha Vuolle2021-08-268-365/+6
| | | | | | | | | | | | The backend provided accelerometer. The backend has been undocumented since the beginning and has been virtually without any activity during its existence. Pick-to: 6.2 Task-number: QTBUG-95789 Change-Id: I7efb3ed10e68a729bc4c834b6c7c3bab9fd8169f Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Document Windows backend specific detailsJuha Vuolle2021-08-191-2/+6
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95784 Change-Id: Ib125591ae8b2d342bfba71e3b9ff81f0795e6cb3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix potential initialization order problemJuha Vuolle2021-08-181-9/+9
| | | | | | | | | | | The logging category is now declared as a function (see the macro definition) rather than as a plain static, which should prevent potential initialization order issues. Pick-to: 6.2 Task-number: QTBUG-68383 Change-Id: Ib71fd7a3840b2dda186c2a06205d781acc389135 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Update make_sensor.pl script to Qt 6Juha Vuolle2021-08-181-30/+56
| | | | | | | | | | The make_sensor script can be used to create new sensor frontends. This commit updates the script from Qt 5 => Qt 6. Pick-to: 6.2 Task-number: QTBUG-92939 Change-Id: Idda4f0eb5f34b4fd9deec7008c4adb444f454a82 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* CMake: Don't give plugins PUBLIC usage requirements part 2Alexandru Croitor2021-08-177-14/+12
| | | | | | | | | | | Plugins shouldn't have public usage requirements. Amends 4686bb97ee8a7159f889e8957537f59d255937c2 Pick-to: 6.2 Task-number: QTBUG-90819 Change-Id: I5adc59533573d7db4ab81873072288f52d3b2b8f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Disable gestures from QtSensorsJuha Vuolle2021-08-167-14/+25
| | | | | | | | | | | | | | | | | | | | The sensor gestures requires some rethinking in order to be of more use for the developers. Therefore we should not yet commit to the old API at least in the first Qt 6 sensors release. This commit disables the gestures by: - Excluding gesture code from compilation - Excluding gesture examples and tests from compilation - Excluding the gesture related documentation - And updating the Qt 6 porting guide Pick-to: 6.2 Task-number: QTBUG-95747 Task-number: QTBUG-95649 Change-Id: I33c1e010825a88b10fa1f7ad49ad3b5383b470aa Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE option on linux backendJuha Vuolle2021-08-131-1/+1
| | | | | | | Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: Id3956b5712d845405196f23492c36b3f7804c324 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-109-9/+9
| | | | | | | Task-number: QTBUG-95170 Pick-to: 6.2 Change-Id: Ic988e041d899c3c50c72404c5511a0cb19932dfd Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Don't give plugins PUBLIC usage requirementsCraig Scott2021-08-056-6/+6
| | | | | | | Task-number: QTBUG-90819 Pick-to: 6.2 Change-Id: I6390d42881e1038904d551f3d1db871eae303575 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make overridden QObject functions public to enable Python bindingsJuha Vuolle2021-08-042-6/+5
| | | | | | | | | | | | | | QSensorGesture implements a custom metaobject and does not use Q_OBJECT macro directly, but rather the key functions are overridden manually. These functions are now made public to allow Python bindings for the sensor gestures. Pick-to: 6.2 Task-number: PYSIDE-487 Task-number: QTBUG-92505 Change-Id: I3682bfa1a39b2a6d85413eb1679492d9b5bd9513 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Examples: Always use Title CapitalizationKai Köhne2021-08-041-1/+1
| | | | | | Pick-to: 6.2 Change-Id: I5930d9381220fbf4337d6cd90b678f0de3354cec Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Specify units in the tilt sensor documentationJuha Vuolle2021-08-021-5/+7
| | | | | | | | Pick-to: 6.2 Task-number: QTBUG-66318 Task-number: QTBUG-92512 Change-Id: Ifaa10eb16006ee9037a8a73eb47176638326fdf2 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Remove unrelated remark from QTiltSensor documentationJuha Vuolle2021-07-021-1/+1
| | | | | | | | | | | The removed part looks like an accidental copy-paste from the QTiltSensor::calibrate() function implementation. Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: If706b8d4e8f0ebc83dfe0e87d6baa0134587354f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Fix and improve sensor configuration file lookupJuha Vuolle2021-07-013-14/+23
| | | | | | | | | | | | | | | | This commit addresses some of the sensor configuration lookup issues - The CMake rule to use compile-time flag was opposite than intended - The configuration file is now looked from all returned configuration paths, not just the last one which seemed a bit arbitrary - Update related documentation, and while doing that also remove references to "N900" which probably won't say that much to people these days (N900 was a smart phone released 12 years ago) Pick-to: 6.2 Task-number: QTBUG-92505 Task-number: QTBUG-92512 Change-Id: Ib66ae052a815bbe3af32bd896931e65375e8546e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* qtsensors: Add QtQml dependencyJuha Vuolle2021-07-011-0/+2
| | | | | | | | | | The QtSensors module needs QtQml as a dependency or else tooling is not able to properly resolve its types. Pick-to: 6.2 Change-Id: I16872f59d58b07781d3a9024bb94a2e021f3f84b Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Remove obsolete gesture emulator documentationJuha Vuolle2021-06-292-75/+0
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: I698e967c106c79f410b2befc7085012b3f999056 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Remove TI Sensor tag supportJuha Vuolle2021-06-2927-2231/+4
| | | | | | | | | | | | | | | | The TI Sensor tag support is specific to a firmware version, and while it could be updated on an ongoing basis, there has not been expressed use for it beyond its initial use cases. As with Qt sensors in general, sensors and platforms can be later reintroduced without compatibility issues should such needs emerge. [ChangeLog][TI Sensor tag] Remove support Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: I70c8514701787cc1d21195546a48b38d8009434f Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Update QtSensors platform- and sensor support in Qt6Juha Vuolle2021-06-2925-1707/+28
| | | | | | | | | | | | | | | | | | | | | | | | | This commit removes the sensor frontend implementations of QAltimeter, QDistanceSensor, QHolsterSensor and their QML counterparts. Since the BlackBerry backend removal in 2015 these sensors have not had a backend support. Sensorfw is not currently supported by Qt6, and as the sole backend provider the following sensors have been removed from documentation until such support is reintroduced: QIRProximitySensor, QLidSensor, QTapSensor and their QML counterparts. [ChangeLog][QAltimeter] Remove support [ChangeLog][QDistanceSensor] Remove support [ChangeLog][QHolsterSensor] Remove support [ChangeLog][QIRProximitySensor] Disable documentation [ChangeLog][QLidSensor] Disable documentation [ChangeLog][QTapSensor] Disable documentation Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: Ic89e91bf65e7a70a2faf0fb566bb24f2f1005a4e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtSensors Qt6 documentation base updateJuha Vuolle2021-06-298-182/+101
| | | | | | | | | | | | | | | | The QtSensors module shall be released in 6.2 for the first time in Qt 6 series. This commit updates the basic things of the documentation accordingly. Documentation for sensor support, platform support, and examples shall be updated with followup commits. [ChangeLog][sensorfw] sensorfw removed from docs for now Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: I7c5e447766109bf9da8ab3cc56fe22ec42dbd875 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Remove unused QmlSensorReading constructor parameterJuha Vuolle2021-06-2221-49/+21
| | | | | | | | | | | The ctor parameter is not used. For clarity it should be mentioned that the memory management of the created 'reading' is done by explicitly parenting the 'reading' in the qmlsensor baseclass. Pick-to: 6.2 Task-number: QTBUG-92505 Change-Id: I4e50bcafa7789f7400364078302339915473a3b1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove unused '_update()' function (code cleanup)Juha Vuolle2021-06-224-12/+0
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-92505 Change-Id: I808065376616ab87af058b2fc5012fc691514589 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add binding support for sensor readingsJuha Vuolle2021-06-2140-274/+418
| | | | | | | | | | | | | | | | | | | | | | | | | Many of the sensors' QML "reading" value properties change with high frequency. This makes them candidates to benefit from the more performant bindable support. This commit adds the bindable support for QML sensor 'reading' classes: pressure, gyroscope, tap, compass, proximity, orientation, distance, magnetometer, lid reading, tilt, rotation, humidity, holster, ambient temperature, light sensor, altimeter, IR proximity, accelerometer, ambient light, and sensor reading baseclass (timestamp common to all) In addition to the 'reading' classes, the commit adds bindable support for QmlSensor::reading, as it's change signal is emitted with high frequency, on every sensor reading change. Pick-to: 6.2 Task-number: QTBUG-92513 Task-number: QTBUG-92503 Task-number: QTBUG-92505 Change-Id: I413ddd8a758142b9b93596e55b3bc8c3c2c98252 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Correct RotationSensor::hasZ type documentation to 'bool'Juha Vuolle2021-06-161-1/+1
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-92512 Change-Id: I72137fa5e1e81b183c058aa600f7fb3204fe1c6c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Sensor identifier autotest and fix related findingsJuha Vuolle2021-06-153-28/+20
| | | | | | | | | | | | | | | | This commit adds a (QML) test for sensor identifier (and activation whose logic is closely related). The related changes: * Change sensor 'identifier' and 'type' properties to QByteArray. This now matches with C++ side that uses QByteArray * Allow changing of 'identifier' after componentComplete. This is now aligned with C++ side. Changing identifier is fine as long as the backend is not connected. Pick-to: 6.2 Task-number: QTBUG-92513 Task-number: QTBUG-92505 Change-Id: I326d840d5a4efb13a3a6578711563e8054cc9961 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make sensor possible to indicate it is no longer busyJuha Vuolle2021-06-156-9/+30
| | | | | | | | | | | | | | | The current implementation allowed sensor backend to only indicate that it is busy, but not to tell when it was freed again. This commit allows sensor backend to indicate also that it's busy state has cleared. It is up to the sensor implementation to decide if it makes sense / is possible to do that or not. Pick-to: 6.2 Task-number: QTBUG-92513 Task-number: QTBUG-92505 Change-Id: Ied4857850e81346031fd83aa347d9955081118e8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Increase QtSensors QML autotest coverageJuha Vuolle2021-06-155-28/+24
| | | | | | | | | | | | | | | | This commit introduces QML based auto tests in order to increase the autotest coverage. Additionally the QML sensor activity handling is fixed which caused the newly added tests to fail. There are also long-standing bugs about these activeChanged() double emits. Pick-to: 6.2 Task-number: QTBUG-92514 Task-number: QTBUG-70770 Task-number: QTBUG-80755 Change-Id: I98f036f665a056c441efa00aab76ec47bc628057 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Replace Q_FOREACH with ranged for loopsJuha Vuolle2021-06-086-32/+22
| | | | | | Task-number: QTBUG-92505 Change-Id: I1e8334473c883f76285736f6a26138ea882f5351 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Port QtSensors to new QML CMake APIFabian Kosmale2021-06-055-91/+3
| | | | | | Change-Id: I73ad44222b2ecefca4457b5dd1713207dc515223 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Fix compilation errors on sensortagsJuha Vuolle2021-06-041-7/+7
| | | | | | | | | | Additionally add find_package() for bluetooth to the top CMakeLists.txt Task-number: QTBUG-94209 Task-number: QTBUG-92502 Task-number: QTBUG-92509 Change-Id: Ied1730e6c3758b2734d8a25d1dcbc43236b997d2 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Add Co(Un)Initialize call to windows backendJuha Vuolle2021-06-041-0/+10
| | | | | | | | | The sensors are accessed through the COM library which requires that the initialization routines are done. Task-number: QTBUG-92510 Change-Id: Idf65b0076432bebbab0de9f24b5e9711d471d193 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Replace Q_NULLPTR with nullptrKevin Funk2021-06-0225-28/+28
| | | | | Change-Id: I9885deb29ebcd5db51a00cbcc2f063bfc418e23f Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Doc: Fix documentation issuesTopi Reinio2021-06-022-8/+4
| | | | | | | | | * Add src/sensorsquick to the documentation project * Remove links to UWP and SailFish from the overview page Task-number: QTBUG-91875 Change-Id: I7c7ed24ddc487c48f423d8b4ffa44154d51872d6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Few cleanups and modernizationsJuha Vuolle2021-06-029-14/+13
| | | | | | | | | | | This commit introduces few source compatible changes: - Change obsoleted Q_ENUMS => Q_ENUM - Mark QSensor::type property as CONSTANT as it cannot change - Add change signal to QSensor::identifier and a testcase for it Task-number: QTBUG-92505 Change-Id: I6e3a652929d15bc5211448be2ae9254ed6d21118 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix and simplify sensor_explorer exampleJuha Vuolle2021-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit strives to both fix and simplify the application and bring its intended demonstrative purpose more forward, consequently hopefully also making the example easier to understand and maintain. First, the sensor_explorer example used QQC1 functionalities which are no longer available in Qt6. The removed elements were such that the datamodels needed to be redesigned. This commit changes the example to use bit more standard Qt model-view approach. Second, the sensor_explorer application has not worked in years on Android due to missing QML plugin installation. While this could be fixed, in the name of simplicity the example is now a single binary. Third, the explorer allowed editing of sensor values. While this could be a feature of the example, it perhaps deviates from the gist of the example making it more difficult to understand. Thus the editing was not added as part of the example rewrite. It can be added later though. Task-number: QTBUG-92514 Task-number: QTBUG-92505 Task-number: QTBUG-63054 Change-Id: Icd620ea605a87ba74a42cd1309a3c02d05b146ac Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Split the Sensors QML plugin into a library and a pluginJuha Vuolle2021-05-2654-975/+642
| | | | | | | | | | | | | | | The main changes: - Introduction of new SensorsQuick library with private exports - The original QML plugin loads this new library and does little else - Renamed original 'sensors' plugin as 'declarative_sensors' to provide an idea what it relates to - Renamed library headers as private "_p.h" and added "We mean it" - Changed qmlRegister* calls to QML_ELEMENT macros - Removed files that are generated in Qt6 (qmldir, plugins.qmltypes) Task-number: QTBUG-92530 Change-Id: I18f849adabcc79ac47e67305f78aefeee82801bc Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Add missed override markers to the SensorTag pluginAlexey Edelev2021-05-251-2/+2
| | | | | Change-Id: Iaf6367a8605a244762422da2d35011598c05f144 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Rename subclass static variable which shadowed baseclass methodJuha Vuolle2021-05-1951-132/+138
| | | | | | | | | | | The 'type' static variable shadowed the 'QSensors::type()' method of the baseclass. While this is easy to workaround it is better to remove such naming clash. Task-number: QTBUG-60246 Change-Id: Id0ddae978377ea4d4d0202a572c554c2541f9364 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Android rotation sensor value and datarate fixJuha Vuolle2021-05-172-7/+37
| | | | | | | | | | | | | | There was a breaking change in Android rotation sensor handling in Qt 5.12.4 when migrating to NDK usage: -The unit conversion logic was not transferred as part of the migration. This task reintroduces the unit conversion part. -The datarate interval was misinterpreted as usec, whereas it is Hz Fixes: QTBUG-77423 Change-Id: Ibe51b3dea393e1cbe1502b5611c07f32024daf57 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> (cherry picked from commit edf82b1d6dc7572da93bbdcd5b4ce46fa1dab2ad) Reviewed-by: Lorn Potter <lorn.potter@gmail.com>