summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-1741-4092/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/config/qt-html-templates-online.qdocconf doc/config/qt-html-templates.qdocconf doc/config/qtsensors.qdocconf Change-Id: Iaf258dbe5311c1f3e190e4b2bff5297f1d4e290e
| | * Doc: Remove unused/old qdoc conf filesSergio Ahumada2015-03-1141-4092/+0
| | | | | | | | | | | | | | | Change-Id: Iefecf07553601f3a20a14f86a7e058ef1ccf9ca7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-171-2/+4
|\| | | | | | | | | | | Change-Id: I4fce7346281a0e89621bc8a38ade07526fb565a8
| * | Certain test cases can only be built with QML availableUlf Hermann2015-03-161-2/+4
| | | | | | | | | | | | | | | Change-Id: I27b6bef6382c599a7ec412895fbb4da0d1760cd0 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-031-3/+3
|\| | | | | | | | | | | Change-Id: I7a4c0c07111285c483867373fe96a045487698cf
| * | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-alpha1Frederik Gladhorn2015-02-241-3/+3
| |\| | | | | | | | | | Change-Id: I7b64e129ef941420378cda207f5fdf90efe4c463
| | * Make sensorfw als values the common standard for QtSensors pluginsLorn Potter2015-02-241-3/+3
| | | | | | | | | | | | | | | Change-Id: I69d15c8af9b6e5acde9d86e185395590369baab6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: I2282a9c336c1b3fad57e03f453bdff95d5df607c
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devSergio Ahumada2015-02-2211-12/+20823
|\ \
| * | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-1311-12/+20823
| |\| | | | | | | | | | Change-Id: I7db3f66a1ac98d32a206c288b53151ad0a249944
| | * bic: Add 5.{1,2,3,4}.0 bic data for QtSensorsSergio Ahumada2015-02-126-0/+20772
| | | | | | | | | | | | | | | Change-Id: I328a947a8a25de542950d4b5c77304c4deb876c0 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-124-12/+12
| | | | | | | | | | | | | | | Change-Id: I294756d2d98972db24bd7d7e2979a92d78c5e060 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| | * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-0/+39
| | |\ | | | | | | | | | | | | Change-Id: I9b6ac654b9f0793e3c711dbd9793cbbc9c37b1e1
| | | * Add changelog for Qt Sensors 5.4.1 release.v5.4.1Alex Blasche2015-01-291-0/+39
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b9c7144a3802a299e620f50ba59557184fdeba6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | | Remove BlackBerry PlayBook support.Rafael Roquetto2015-02-186-421/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id1247f797873395c38251ba098bfa848a06f10ee Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | | | Update copyright headersJani Heikkinen2015-02-17438-2881/+2809
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I141862df4ed2475c05ebbeb8fe447c4a6e736849 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* | | Update plugins.qmltypes for QtSensors 5.5 releaseAlex Blasche2015-02-062-5/+5
| | | | | | | | | | | | | | | Change-Id: I4b5bd46487a3589171f115aba1ee1a57d0273f35 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | Cleanup QtSensors QML plugin project fileAlex Blasche2015-02-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This was ancient code and qmake got much smarter since then. It caused an incorrect "qmltypes" make target too. Change-Id: I4dbbd70a80fac71dbf033e1af9fb5f256c7279c0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-190-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib87eba614edcfef97f64a224fa336d607eec6ea1
| * | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ | | | | | | Change-Id: Idfebc2d8189b831ddb94d951a93cba2744a08340
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-024-4/+56
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I58c54028067aa0be09ec6542e9b7154396b08d0f
| * Do not install the dummy sensors plugin by defaultAllan Sandfeld Jensen2014-12-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The dummy sensors plugin will start fake sensors that emit 100 updates per second. This should not be the default sensor returned when a user requests a sensor. These sensors were default on Linux. Task-number: QTBUG-39475 Change-Id: Ia276e904f93dfeef95f7490ec7cb51cad260a2a8 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-171-0/+48
| |\ | | | | | | | | | Change-Id: I74fd8ea4b5d458706c7269572fa4679e6fd60a57
| | * QtSensors changelog updated for Qt 5.4.v5.4.0Alex Blasche2014-12-031-0/+48
| | | | | | | | | | | | | | | Change-Id: I3e34ba8503f7b4675a6c629ff5baf9370a7cf63c Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * | Change Qt bugtracker URL to qt.ioAlex Blasche2014-12-161-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I5ecc2a929812667609c938f38c3d9195bda1f1ae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | | | | | Change-Id: Id0d1dc490649ce0522deead171165afaa44731dd
| * | Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-081-2/+2
| |/ | | | | | | | | Change-Id: I23232dcb9d13605f973144f64ffb93b0d9013c65 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-0924-27/+73
|\| | | | | | | Change-Id: Ie542c953df0bac854da2fd2f00043509addf87f2
| * Doc: Applied title case in section1 titlesv5.4.0-rc1v5.4.0-beta1Nico Vertriest2014-10-095-9/+9
| | | | | | | | | | | | | | Task-number: QTBUG-41250 Change-Id: I788332e3db66e8188fc7d64d1e31995f4b432932 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Add \since tag to QtSensor classes.Alex Blasche2014-09-2619-18/+64
| | | | | | | | | | | | | | | | | | | | QtSensors was released first by Qt 5.1. A few whitespace changes go along as well to unify the formatting. Change-Id: I6f6e15c95c1a5f33731782e429e87cef68e96e3b Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-09-1923-680/+176
|\| | | | | | | Change-Id: Id81b14a4e11f4b64b82cc4c4410046858c76dd74
| * Remove cube exampleAlex Blasche2014-09-1815-666/+0
| | | | | | | | | | | | | | | | | | | | The example doesn't offer much example value. The accelerometer is presented by the accelbubble example too but doesn't have all the Qt3d dependencies. Cutting those dependencies is much cleaner. Task-number: QTBUG-31076 Change-Id: I074b24974cbd630d7b6ccc9eb21d8cabc96da86c Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Fix a couple of issues in the maze exampleAlex Blasche2014-09-184-10/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.) Remove dependency on QtSystemInfo. The module is not officially supported at this stage and screen saver related code is not really required for the example. 2.) Add AndroidManifest.xml to lock the screen orientation in portrait mode. Since the example depends on the tilt sensor a rotating UI is messing the game up. 3.) Port app to current TiltSensor API. The game works but its biggest problem remains the UI. It uses fixed-size UI elements which makes it tiny on High DPI screens. Task-number: QTBUG-31076 Change-Id: I73df9361b5171da930df66072e8ee9eba89b71ad Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-160-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic6cdc4873d153c8a7d5d233b70c50879eaf49c9c
| | * Bump version5.3Frederik Gladhorn2014-08-291-1/+1
| | | | | | | | | | | | Change-Id: I302c83fa8edd1d9e7f350c5d1e2edab3c7c0acf8
| * | Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1Frederik Gladhorn2014-08-285-4/+111
| |\| | | | | | | | | | Change-Id: I7c2b192d4b3b4d745096058fd69921d855433f85
| | * Add missing private headers warningv5.3.2Samuel Gaist2014-08-182-0/+22
| | | | | | | | | | | | | | | | | | Change-Id: I06883e0f2bb16999f13993b69b3701443912c5cc Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| | * Do not warn when failing to load static plugins as sensor pluginsEike Ziller2014-08-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since the list of static plugins can contain all kinds of plugins, failing there is expected. Change-Id: Ia5051c75691717b2e7279a68ea06f7697cbca053 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Do not warn if no config file is found.Eike Ziller2014-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since this is the default situation. Change-Id: I9ab76b8ef9402fe39df0aaa532b61bd43b520b71 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Add changelog for QtSensors 5.3.1 and 5.3.2 releaseAlex Blasche2014-08-132-0/+85
| | | | | | | | | | | | | | | Change-Id: I98bd8e3989fc78b552e7685274143c0b8bd90e5e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-28349-7136/+4167
|\| | | | | | | | | | | Change-Id: Id428d4ac5496b03c2237268f71aaf1b591726b95
| * | Update license headers and add new licensesJani Heikkinen2014-08-24349-7136/+4167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I99c601a398559886c2900f3e04833acfceba8263 Reviewed-by: Antti Kokko <antti.kokko@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-08-1828-80/+485
|\| | | | | | | | | | | Change-Id: I4a589c2f9005f6bfd9242e335387ec690e97210a
| * | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-1221-78/+184
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/sensors/sensorfw/sensorfwproximitysensor.cpp src/sensors/qcompass.cpp Change-Id: Idfcbbfe1757a4b827663453abc27f4026cd3d752
| | * Add missing word to QCompass documentation.Mitch Curtis2014-07-181-1/+1
| | | | | | | | | | | | | | | Change-Id: I46b9a3c20b5169843292057439c80c859ccc7e82 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| | * Restore setting of sensors interface.Robin Burchell2014-07-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change I5c1bf3999ad2268c0dba9b3fe511d999c2e63fd9's forward porting from Qt 5.1 removed this, thus the interface was never set, thus sensors all broke. Change-Id: If3b14b5ebd20e6cb64bc2000b23a2c1e37d36b05 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Series of crash fixes from Mer, squashedLorn Potter2014-07-1014-81/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1)tracing plugin loading 2)m_remoteSensorManager can be nullptr But it seems it does not solve incorrect initialization in the case manager interface is nullptr: init() for different sensors does not check initDone 3)split initSensor() to template function and function most of initSensor() does not depend on template param, so it is better to split it -> less code should be generated 4)do not use sensor manager if it is invalid 5)correct class members initialization order 6)assert sensor interface is not null From what I saw according to logic it should not happen so using Q_ASSERT for better maintainability 7)check local interface pointer in SensorfwTapSensor::start() Signed-off-by: Denis Zalevskiy <denis.zalevskiy@jolla.com> Change-Id: I5c1bf3999ad2268c0dba9b3fe511d999c2e63fd9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * [sensorfw] need to run init after sensord has been restartedLorn Potter2014-07-1019-0/+63
| | | | | | | | | | | | | | | | | | | | | This ensures things are setup and work properly. Change-Id: I23c8b53e760d49695c5ae207eed77a2e7d2be3a4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Compass sensor implementation for AndroidPaul Olav Tvete2014-08-127-0/+298
| | | | | | | | | | | | | | | Change-Id: Ic13d2d1e400a92b2f0c3c83e279c58b799f9d06b Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * | Clarify the QCompass coordinate systemPaul Olav Tvete2014-08-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The compass behaves like the other sensors: it is measured relative to the top of the device. Change-Id: Iddc4ad6a16f8b09d26a9d300155324bb8d378b76 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>