summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devHEADdevQt Forward Merge Bot9 hours5-26/+177
|\ | | | | | | Change-Id: Iba47a90c345bd18c156ae4bddfa6e9931ff98804
| * Merge remote-tracking branch 'origin/5.14' into 5.155.15Qt Forward Merge Bot3 days5-26/+177
| |\ | | | | | | | | | Change-Id: I1551d1e2d9b720bb0f28fb0d056a8492699afee5
| | * Fix QML API for sensor ranges5.14Ulf Hermann7 days5-26/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot5 days1-2/+2
| | | | | | | | | | | | | | | Change-Id: I7607843caf5896f6c541daa5b896a1afd2f4b823 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot6 days1-2/+2
| | | | | | | | | | | | | | | Change-Id: Iecc9b9804e216baf0de116f911059b5cf055286a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot11 days1-2/+2
| | | | | | | | | | | | | | | Change-Id: Id5abb659243b477214a680db1377c2d4f5f2fdc4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot12 days1-2/+2
| | | | | | | | | | | | | | | Change-Id: I98c3bfdef8f50d67c5d997fcc51bb4cd83aedbc4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | Change-Id: I45f5f9ef35575b538be2ac3f749e33301d56d738 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | Change-Id: I926d3950e0dd3ddfbee60992883ab4ee3a15fb58 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-221-2/+2
| | | | | | | | | | | | | | | Change-Id: I45b977f254bb8407ac8f2d10fab036b9273a26da Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-161-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: Ie7d039857f5a8f9bfea4d0cbbd95c5fcaf31b177
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Idd1ece3e55b23619f4f549da729ff67d0fd22547
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7c9aaec71adbf1f0bc040e38b8f2e767022baa81
| | | * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+21
| | | |\ | | | | | | | | | | | | | | | Change-Id: I1861cad644f2e655a97ddac7559350120ca61c7b
| | | | * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-161-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 47d1ff2813575981d02434d6cffd6384687f832b Binary compatibility file for Qt 5.13.0 for QtSensors + b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42 Add changes file for Qt 5.12.5 + 220ab35bfd864cb390e9051b9563587319f58bd4 Doc: Remove non-existing arguments from docs + 9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545 Doc: Replace WinRT with UWP in Qt Sensors module docs Change-Id: Ib88726f557bb0e3209a757fa0beec5845ebc3e9a Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9e2cc04853a9d3dbec53258e00badcbb9ff19ece
* | | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6d55e0cf51b441246eefcb1c2d06d2c093b8ffd7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50ecfe6cb32ae06469a72cffb82809bc0a3beb31 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Icfcbc1d142766ae47f5b8c57f52b4f9270c5bd32
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | Change-Id: I5a93ae6703507083238ca31a72d9dabd0210935a
| | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-261-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: Idb20ba0646891ab3b6fe73c88cee26747516eb30
| | | * | Don't ask for gui when we don't need itEdward Welbourne2019-10-251-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its inclusion in QT broke builds that are fine without it. Change-Id: I457def5945dc3db5b2cf2137c9de1917e941d0c3 Task-number: QTBUG-79353 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1d75b937f2cccd5f30a615868d5c8bb9b2aa29d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I7410bd43069c433a43d85d71305790b727c9e331 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I1f1bf3f581131bdd7c7ae9f73224fa72247e9f72 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6dc6e855a4d09f3ef8c5cd0073a735b2e6e4743c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-026-28/+79
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I729fc3aca8aab817b3e98ddaffd979235308d16b
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-266-28/+79
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I49c2b397af3fcf54347f8c18d655ab1080c675e8
| | * | Update AndroidManifest.xml to be compatible with Qt 5.14Eskil Abrahamsen Blomfeldt2019-10-252-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary changes to be compatible with AAB changes in Qt 5.14. Change-Id: Ic574ac5d2401e9241eeb48061959c069a5c0e725 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * | Enable shadow-building the sensor_explorer example on WindowsFriedemann Kleint2019-10-253-19/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When package-testing, a shadow-build of the example fails due to the import plugin not finding "main.moc", which is apparently caused by the directory structure and using DESTDIR = ./ Add header "main.h" to avoid having to deal with "main.moc". Change-Id: I04024c8d282b4f56d9942c0c8414d0b6ff9b1d20 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Update plugins.qmltypes for 5.14Kai Koehne2019-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: If399aff73104144bfb4b5de74e64ed7b54f8f63d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-311-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I70bca9c98116b62404f857ca11b10e151d733ac9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieea0552ebcbdfcf0331bdc2633374c5dc424e07b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I438cf589b7a541f39af177133f8a1bbbaac594a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e4ee735700b46ce7313c468c1ce837a4e036afa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I5764ffb1118b3de5f43fc4cb6799717dec8774e0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I5dd369be1b28f15e7a70d7b6f9703ffc21116b5b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia63b2fa38a319f183790502e63b327a508fa27b1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie026cc807edecf8ee179e284b713dbf6988b292e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I29db4d8749e61f534ac5187ff4bb97a236a69a69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2b80ca8f735012375abf13996b81536f926bfc20 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I81fe4fd47f0448f1b3a88eeb4dcebe9c3fd4b0bb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I7deaa521a282396b1e04c03295601e50fa42ef12 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6214ea8f863ff9b24fdcd36b89953b37720dab24 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I64610d27d33d7b777280c586d9aa3ad692573c3a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-121-1/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id6b9634106adce3e191a203d1f36ca95fc2c4a03
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-051-1/+1
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I475f4b105a9c9fd3f2d65c843d414f3ef01a6de4
| | * | Fix library namev5.14.0-beta2v5.14.0-beta1BogDan Vatra2019-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-78616 Change-Id: I63ae0ef7d83cf2336ede280530de54688bf4fa76 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ief64491da6ea3ce4ecc8207e5f7211ab1612562a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtsensorsQt Submodule Update Bot2019-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id906231e6f08c85274c1536a80309c990b1971ad Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>