summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Use renamed qt6_add_plugin PLUGIN_TYPE optionAlexandru Croitor2021-08-109-9/+9
| | | | | | | | Task-number: QTBUG-95170 Change-Id: Ic988e041d899c3c50c72404c5511a0cb19932dfd Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 00c295786711829ef2dcd821e22e17c9a731a670) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Don't give plugins PUBLIC usage requirementsCraig Scott2021-08-056-6/+6
| | | | | | | | Task-number: QTBUG-90819 Change-Id: I6390d42881e1038904d551f3d1db871eae303575 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 4686bb97ee8a7159f889e8957537f59d255937c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. 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> (cherry picked from commit 5bcc6622c4283703c9f8cb5fcf9e983b6e91b377) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Examples: Always use Title CapitalizationKai Köhne2021-08-041-1/+1
| | | | | | | Change-Id: I5930d9381220fbf4337d6cd90b678f0de3354cec Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 768ea94fdf7e6f10767ef843d576ac4729046c67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Specify units in the tilt sensor documentationJuha Vuolle2021-08-021-5/+7
| | | | | | | | | Task-number: QTBUG-66318 Task-number: QTBUG-92512 Change-Id: Ifaa10eb16006ee9037a8a73eb47176638326fdf2 Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 2c38243d9f4a59260a207170ae799edbd08e3d6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-92512 Change-Id: If706b8d4e8f0ebc83dfe0e87d6baa0134587354f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 455e5a973be5f7c3afaff147f4482a69d134b5bd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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) Task-number: QTBUG-92505 Task-number: QTBUG-92512 Change-Id: Ib66ae052a815bbe3af32bd896931e65375e8546e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 108e7d9e5fad438e565305104ec3712bff6561b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Change-Id: I16872f59d58b07781d3a9024bb94a2e021f3f84b Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 2792d190cab778b2f1ed4591156fd2a282ec5d31) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove obsolete gesture emulator documentationJuha Vuolle2021-06-292-75/+0
| | | | | | | | Task-number: QTBUG-92512 Change-Id: I698e967c106c79f410b2befc7085012b3f999056 Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 2e18032f1f4228d2ed8270dac29efabcc9ca1ffc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Task-number: QTBUG-92512 Change-Id: I70c8514701787cc1d21195546a48b38d8009434f Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit acd80292bb9a62105204f012cf70d56d8c4b9ada) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Task-number: QTBUG-92512 Change-Id: Ic89e91bf65e7a70a2faf0fb566bb24f2f1005a4e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit d40c4d0b3766043cf4fbaa87acd76b11bf733369) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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 Task-number: QTBUG-92512 Change-Id: I7c5e447766109bf9da8ab3cc56fe22ec42dbd875 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Lorn Potter <lorn.potter@gmail.com> (cherry picked from commit 175a5ab34240c723ad2c2a2d60ad38a01ed6d218) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-92505 Change-Id: I4e50bcafa7789f7400364078302339915473a3b1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 89905b1ea1c81013d21093c95f6fee2665fdaa69) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove unused '_update()' function (code cleanup)Juha Vuolle2021-06-224-12/+0
| | | | | | | | Task-number: QTBUG-92505 Change-Id: I808065376616ab87af058b2fc5012fc691514589 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8ca52678587e2c7e7bc45bf205a734aad72e3008) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. 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> (cherry picked from commit c255fe62f86598f48bd7e69e449aa95aa016f4fb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Correct RotationSensor::hasZ type documentation to 'bool'Juha Vuolle2021-06-161-1/+1
| | | | | | | | Task-number: QTBUG-92512 Change-Id: I72137fa5e1e81b183c058aa600f7fb3204fe1c6c Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 491a3f9980b964c49ecd2301548f6db3cd96f127) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-92513 Task-number: QTBUG-92505 Change-Id: I326d840d5a4efb13a3a6578711563e8054cc9961 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit c3cc1253ba159e6f4c9bd4c92da2b8c300ee94f2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-92513 Task-number: QTBUG-92505 Change-Id: Ied4857850e81346031fd83aa347d9955081118e8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit f8445fdcbf75e455443304bc290c48c37961e9f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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. Task-number: QTBUG-92514 Task-number: QTBUG-70770 Task-number: QTBUG-80755 Change-Id: I98f036f665a056c441efa00aab76ec47bc628057 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 54b3ca67ad7230a21d76c581dd4287401acb230f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 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>
* Android: use new public jni apisAssam Boudjelthia2021-05-102-21/+28
| | | | | | | | | Replace use of QJNIObjectPrivate with QJniObject. Get context() and sdkVersion() from QNativeInterface::QAndroidApplication. Fixes: QTBUG-92550 Change-Id: I625b2269ef253e1a1f76f82edebac236de184c2c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtSensors: Fix iOS sensor backend loadingTamás Martinec2021-04-301-2/+6
| | | | | | | | | | Setting the default backend to the last registered backend if the current default is a dummy backend. Task-number: QTBUG-92508 Change-Id: Id67625544f0da2dae118998429c0aeeee2a94cb2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
* Disable PCH on iOS pluginJuha Vuolle2021-04-201-0/+5
| | | | | | | | | | | If a target inherits precompile headers from a different target that has more languages enabled (CXX, OBJCXX), the target will depend on PCH artifacts for a language that is not actually present. Task-number: QTBUG-92502 Change-Id: Ib8d27a63d3f6e0afeb55f4ce3988edd6c0b8ce81 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Compile-config test for winrtJuha Vuolle2021-04-203-3/+21
| | | | | | | | | | | | | While winrt as a "windows phone" is not supported anymore, the APIs are available on windows and can be supported where applicable (bluetooth, positioning, sensors, ...). This commit adds a configuration tests for the presence of these headers and libraries. Task-number: QTBUG-92502 Change-Id: Ia6dcb0a6b8ecdbcf1d1bcf79e42f95ace75f6657 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QtSensors initial cmake supportLorn Potter2021-04-1971-2554/+643
| | | | | | | | | | | | | | | | | This commit introduces the bare minimum cmake support that should unblock the CI and allow further verification and development on most platforms: macOS, Linux, Win, iOS and Android. Some clarifications: * The support for sensorfw backend is very preliminary and can be enabled later if needed (no Qt6 version of the sensorfw). * The simulator backend is dropped as obsolete / unnecessary. * Three examples are currently commented out and shall be ported with a later commit. Task-number: QTBUG-92502 Change-Id: Id523d43ed3ef177010dc73afc5812ed374cff0dd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Base commit to make QtSensors runnable on WindowsJuha Vuolle2021-04-1915-157/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | Fair amount of work remains after the commit still, but this should allow further development as a compilable baseline: code compiles, autotests pass, and most example applications at least start. The changes: -Change examples to use QtQuickControls 2 as per removal of v1 -Fix ambiguous conditional expression compilation error -Link against runtimeobject library (previously part of winrt QPA?) -Change the .pro file rule to win32 as winrt moniker does not exist anymore -Remove references to deleted winrt event dispatcher -Fix error handling: getdefault may be successful even if there is no default sensor -Fix QCOMPARE failure output (toString has changed in Qt6) -Remove qtimestamp alias which was deprecated already in Qt5 -Remove unit test hook that does not seem to be used anywhere -From typedef to ‘using’ for readability -Q_ENUMS -> Q_ENUM as the former has been obsoleted by the latter -Add qt6 changes qdoc page Task-number: QTBUG-88616 Change-Id: I92c168228ba76106b2c636c88f54331c76c3d2e6 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove two QChar related deprecation warningsJuha Vuolle2020-12-181-2/+2
| | | | | Change-Id: Ia2ecc159b8c53035673a7250230ed0a56bfa06a2 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Qt6 uses qsizetype for the qqmllistproperty size/indexesJuha Vuolle2020-12-181-2/+2
| | | | | Change-Id: Ifea53d932e1c5726c57dc31f0c7a40892db3501c Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* QAtomicInt load() and store() are removed in Qt6, change to *Relaxed()Juha Vuolle2020-12-171-2/+2
| | | | | | Change-Id: I719afb5243a6e4e8d54a7f82a74a0c6bf0207c98 Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-302-3/+3
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I36a9c2a142b8485755b8849b839eac972e288bf6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-259-21/+19
| | | | | | | Task-number: QTBUG-84469 Change-Id: I4ef3c22412f5978b3474c0ccd90bae08fd7f1297 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-101-3/+3
|\ | | | | | | Change-Id: I04bcb739fdaaaf4a4aa052b19cbd0b690b0c8947
| * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Qt Forward Merge Bot2020-03-071-3/+3
| |\ | | | | | | | | | Change-Id: Iab2eee7fbd86759c6f9512b79c65ca5dc773b748
| | * Doc: Make sure to advocate latest sensors importKai Koehne2020-03-061-3/+3
| | | | | | | | | | | | | | | Change-Id: I37f010fa8f9ab3f4b3c1f355110228ae1ce58dc3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-291-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: If4b8ecc6e59564b5cf82b91c56baef2c8b96511b
| * | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I38c24b441c3778ee316651ee5f5eaf6f3abf815d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-103-26/+60
|\ \ | |/ | | | | Change-Id: Iba47a90c345bd18c156ae4bddfa6e9931ff98804
| * Fix QML API for sensor rangesUlf Hermann2019-12-033-26/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the QQmlListProperties were constructed on stack-allocated lists, which immediately turned into dangling pointers on return. Also, none of the sensor ranges was ever deleted. Keep the sensor ranges in persistent lists in the private object, parent them to the main QmlSensor object, and add some tests for them. Fixes: QTBUG-79224 Change-Id: Ie61d0aaeaaaf998c1d1f46f60c81848ae48659d6 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-021-1/+1
|\ \ | |/ | | | | Change-Id: I729fc3aca8aab817b3e98ddaffd979235308d16b