summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'release' into stableSergio Ahumada2013-06-0623-27/+44
| |\| | | | | | | | | | Change-Id: I589d4840a0f0cc16656033ab34fcce10b9a499cd
| | * Doc: Removed duplicated list in Qt Sensors Examples page.v5.1.0-rc1Jerome Pasion2013-06-061-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | \generatelist is not needed for group pages because QDoc will generate the list already. Change-Id: If04b07af292e4c05e4b6f933612027773837a6c3 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * fix build in OBS, as well as fixes for API changes.Lorn Potter2013-06-0622-23/+44
| | | | | | | | | | | | | | | | | | | | | Change-Id: I27eabe7c8b79e03d814deb541db5e7f0b5449099 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * | Fix warning by the compiler, probably caused by a bad conflict resolutionThiago Macieira2013-06-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qshakerecognizer.cpp:161:28: error: expression result unused [-Werror,-Wunused-value] The statement was unused, the last branch of an || that was removed in fb06538f. Change-Id: I4badb3e5f4272086d44004b9beaca330f8ed7ab6 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| |/ | | | | | | | | Change-Id: Iac439fff68a414ffc75efb4195282c41678bcfa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Update all plugins.qmltypes filesLiang Qi2013-05-271-39/+134
| | | | | | | | | | | | | | Task-number: QTBUG-31388 Change-Id: I7a1a0b692d49961d07ae174cb5c2a614295ec98b Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Doc: Fix errors in Qt Sensors QML exampleTopi Reinio2013-05-274-187/+149
| | | | | | | | | | | | | | | | | | | | This change fixes the errors in example QML code by replacing the overuse of anchors with Column/Row components, and cleaning up by refactoring reusable code into a new QML type. Task-number: QTBUG-31076 Change-Id: Iade6f98d7db716848c44d4066aa23064929b32f2 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: Id7e1130333e71acca7120fc6dd99ae4152e48a86 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * Doc: Removed landing page from the "technology-apis" group.Jerome Pasion2013-05-241-2/+0
| | | | | | | | | | | | | | | | The group in qtdoc is removed because the new overviews on the landing page replaced the group. Change-Id: I2e266d8d41ff933c033711880d088fed8f0a8abd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Fix pkgconfig dependsLorn Potter2013-05-231-1/+1
| | | | | | | | | | | | | | We call it sensord-qt5 now. Use this instead of the qt4 sensord Change-Id: I54f9de52e572f0afbfef742cf0c84fc64f1469f0 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Fix MSVC-warning about comparing bool and qreal.Friedemann Kleint2013-05-231-1/+1
| | | | | | | | | | Change-Id: I10ea0eb3f5bacebe0d72cdce4fac529957c64f2e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | iOS: change accelerometer to use QTimer for pollingRichard Moe Gustavsen2013-06-052-37/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the docs (CMMotionManager class reference) there are two ways of interacting with the accelerometer; Either through the callback API (NSOperationQueue), or peridic sampling (polling). Our first implementation of IOSAcceleometer used the former technique, which turns out to have bad performance when using the sensor together with a fine-grained QTimer. And this case is pretty common when using sensors together with e.g QML. Reading through the docs more carefully, they recommend using the polling technique when creating games instead since the NSOperationQueue introduces some overhead. So this patch does that, change the implementation to use QTimer based polling. And this solves the performance issues found. Change-Id: Ifde0d2292302467afb8db90a954ef45f3238350e Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2370-102/+578
|\| | | | | | | Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d
| * Sensors examples: Use resource system for QML examplesTopi Reinio2013-05-2317-1/+116
| | | | | | | | | | | | | | | | | | | | | | Adds resources (.qml, .js, images, etc.) used in QML examples as Qt resources. This enables running the examples successfully when shadow building, without copying the files around. Task-number: QTBUG-31076 Change-Id: I0f3352cffdc334f6139aac60acd3345710516d65 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Add module check to examples .pro-file.Friedemann Kleint2013-05-211-2/+6
| | | | | | | | | | | | | | Task-number: QTBUG-31076 Change-Id: I345cb91f82262b64c2d414bec585e5a7ca724ce3 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * add a few more big changes to changes file.Lorn Potter2013-05-201-0/+4
| | | | | | | | | | Change-Id: I663cce2f5aff72661e2b35fca8320ed79cd0157f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Add changes-5.1.0 fileSergio Ahumada2013-05-151-0/+48
| | | | | | | | | | Change-Id: I36870eb23fd0fe3de76642f29ba6509ba44dca44 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Remove debug output.Friedemann Kleint2013-05-132-2/+0
| | | | | | | | | | | | | | Task-number: QTBUG-31074 Change-Id: I7cb66ccbe74203e87e3bcc60400a8f7b2b2be0ed Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Document that the QSensor constructor should not be used directlyThomas McGuire2013-05-082-0/+33
| | | | | | | | | | Change-Id: I1907497b2bb3b1be65e98223e0337eef358743b6 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Add a private class to QSensorBackendv5.1.0-beta1Thomas McGuire2013-05-063-34/+124
| | | | | | | | | | Change-Id: Ifaac09159420b6cca197614a1fa9df8b6a8692dc Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * BlackBerry: Fix for GeoValues supportBernd Weimer2013-05-061-3/+1
| | | | | | | | | | | | | | | | Generic QSensor("QMagnetometer") crashed, because of a null pointer access. Fixed by disabling geo values support for generic magnetometer sensors. Change-Id: Ie3e654df10f325ff42cd3a08c3108e9b7a84604f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Make it possible to bundle Android buildsEskil Abrahamsen Blomfeldt2013-05-065-13/+25
| | | | | | | | | | | | | | | | | | Add the bundled jar file and information about required plugins. Task-number: QTBUG-30751 Change-Id: I41918e8f04449439703ef1ae91c78636e9475f36 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Fix some potential binary compatibility issuesThomas McGuire2013-05-0639-48/+220
| | | | | | | | | | | | | | | | | | Mostly de-inlining methods, and in addition providing a virtual destructor. Change-Id: I0aef91e7a896e8a16fc023a11bd35a5ef3048ee6 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Doc: Define examples install path in .qdocconfTopi Reinio2013-05-031-0/+2
| | | | | | | | | | | | | | | | | | QDoc needs to know the directory under which the examples are installed in QT_INSTALL_EXAMPLES. Without it, example manifest files may contain invalid paths. Change-Id: Iac69054982d7f93d8282a935f278ba32eae6c72e Reviewed-by: Martin Smith <martin.smith@digia.com>
* | add a way to collect sensor dump in the format the autotests can use.Lorn Potter2013-05-086-0/+558
| | | | | | | | | | Change-Id: Iec9be6e858aabd579ea61e48fd5b9d884c980fc3 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-2910-6/+431
|\| | | | | | | Change-Id: I4cfd0e2a2f108f5ecf79c56418c02928b041856e
| * iOS: enable generic sensorsRichard Moe Gustavsen2013-04-231-0/+4
| | | | | | | | | | Change-Id: I400661cabd4839f8a4e0c2b648a8a62a161dc955 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Generic: set PLUGIN_CLASS_NAME to help static builds (iOS)Richard Moe Gustavsen2013-04-231-0/+1
| | | | | | | | | | | | | | | | | | | | qmake will parse QTPLUGIN when building static apps, and create a stand-alone cpp file that adds the needed Q_IMPORT_PLUGIN lines. But for this to work, PLUGIN_CLASS_NAME needs to be set. Change-Id: Id92d78f3d77c3ce0d59fd27eec1df3271a947d51 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * QSensor: fix spelling in docRichard Moe Gustavsen2013-04-231-1/+1
| | | | | | | | | | Change-Id: Idcd84adc62015aa7986275b320f3bacf45c94635 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * iOS: implement proximity sensorRichard Moe Gustavsen2013-04-165-3/+216
| | | | | | | | | | Change-Id: Ia4c2dbe4f81ceda1600f9f642effbc3377cfa94d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * iOS: implement compassRichard Moe Gustavsen2013-04-165-4/+211
| | | | | | | | | | Change-Id: I639a472cd2dfca177282cb4961d589f11f924e36 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-1612-24/+23
|\| | | | | | | Change-Id: Ia02497aafc94feba0381ffe8733cbc89f29fb412
| * iOS: implement magnetometerRichard Moe Gustavsen2013-04-146-3/+239
| | | | | | | | | | Change-Id: I611e1ccafb0362b78737785e9cc7f4f48278063a Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: remove unneeded void pointer casting in private headersRichard Moe Gustavsen2013-04-142-4/+5
| | | | | | | | | | | | | | | | | | | | The headers in use for the sensor backend are private, and should never be directly included in any .cpp files. As such, we don't need to be careful using obj-c features in the header files. Change-Id: If16a84c88a7e7afc45afe00e668e4582337e4907 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: add QPointer guard to accelerometer and gyroRichard Moe Gustavsen2013-04-142-20/+34
| | | | | | | | | | | | | | | | | | | | Since we process data from the sensors using a callback queued to the application operation queue, we need to check that the qt sensor is still alive before accessing it. Change-Id: I697d72f94aedec34b125006d6405428e282bfc0d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: refactor and simplify IOSAccelerometer codeRichard Moe Gustavsen2013-04-142-74/+22
| | | | | | | | | | | | | | | | | | | | | | | | The code as it stood made use of an extra obj-c class to listen for sensor readings. This is not needed with the block (lambda) API used by CMMotionManager. This will also make IOSGyroscope and (soon) IOSMagnetometer follow the same code pattern. Change-Id: If945f8616f4cdde98b31382fcd9c555c2b490c4a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Remove REVISION 1 from alwaysOn property.Thomas McGuire2013-04-111-1/+1
| | | | | | | | | | | | | | | | This is a leftover from QtMobility and has been available since Qt 5.0. Change-Id: I68300b402aa04f2ca9e9b609cc859327c26e1a8f Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Remove TODO commentsThomas McGuire2013-04-111-4/+0
| | | | | | | | | | | | | | With sensorfw we actually have a backend that uses these now. Change-Id: Iba088dc356a54ae43f29e8b5f77349a9a98c4d09 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Add missing Q_REVISION(1) to new 5.1 signalsThomas McGuire2013-04-112-8/+8
| | | | | | | | | | | | Change-Id: Ic98e6b4d9f4ac5c676d2183799a5a838c5085a70 Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: remove unnecessary test for accelerometer availableRichard Moe Gustavsen2013-04-101-17/+14
| | | | | | | | | | | | | | | | | | The accelerometer is always available, so no need to check for this. Change-Id: I79411ff023c4350c5b31d4fad048484db2b2fe43 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: set data rate on accelerometer before starting itRichard Moe Gustavsen2013-04-101-0/+4
| | | | | | | | | | | | | | | | | | Respect user data rate settings by applying the rate just before the sensor starts Change-Id: I3da37497c574cbf94d57699c941ce2bf3b54373c Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: bugfix accelerometer timestampRichard Moe Gustavsen2013-04-101-1/+3
| | | | | | | | | | | | | | | | Convert from NSTimeInterval to microseconds Change-Id: I51fb3791aa72dcc7514c39820e4347a3c1d4039a Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * iOS: implement gyroscope for iOSRichard Moe Gustavsen2013-04-105-5/+172
| | | | | | | | | | | | Change-Id: I4a46908a4b4e166c489dce4a034ef68698288419 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * doc: Removed the HTML template from the .qdocconf filesLaszlo Papp2013-04-051-1/+0
| | | | | | | | | | | | | | qt-module-defaults.qdocconf already contains the HTML template. Change-Id: I06218652147efeb1f86b34e0d52ae413987e4e87 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Android: Report correct timestamp valuev5.1.0-alpha1Paul Olav Tvete2013-04-045-5/+5
| | | | | | | | | | | | | | | | Android uses nanoseconds for the timestamp while Qt uses microseconds. Change-Id: I1a6a4c2c3e8cfc950d795e00b7d7546869399f29 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Fix warnings in qtsensorsThiago Macieira2013-04-033-5/+9
| | | | | | | | | | | | | | | | qtapsensor.h:110:34: error: extra ";" [-pedantic] qsensor.cpp:147:12: error: ‘qrange_id’ defined but not used [-Werror=unused-variable] dummycommon.cpp:151:9: error: variable ‘ok’ set but not used [-Werror=unused-but-set-variable] Change-Id: Ief3b4841bae7c255a40ad8f19f3f8733a613db48 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | iOS: implement magnetometerRichard Moe Gustavsen2013-04-106-3/+239
| | | | | | | | | | Change-Id: I611e1ccafb0362b78737785e9cc7f4f48278063a Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Fixed manual sensor testBernd Weimer2013-04-091-1/+1
| | | | | | | | | | | | | | Widgets module was missing in project file Change-Id: I4b5ba34a35e6097231b134b967b03689ca71fa0d Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Added temperature property to pressure sensorBernd Weimer2013-04-0912-1/+109
| | | | | | | | | | | | | | | | | | | | | | Many air pressure sensors provide their temperature, as well. This can be used for temperature compensation for instance. The pressure sensor API has been extended and a BlackBerry backend has been implemented. Change-Id: I188e1276dff74601d757d0a356b28b4fea4594bd Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-031-0/+4
|\| | | | | | | Change-Id: I14f923883afe9f43282e449725f509e0688e597e