summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-11-0821-231/+231
|\| | | | | | | Change-Id: Ie5df603a69a8cf2c15f6a6137fcf3edd00d62523
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Id4428de7ea0a7a4f7dd7a28d76927195c61755ce Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Doc: review of QtSensorsNico Vertriest2013-11-0411-121/+133
| | | | | | | | | | | | | | | | | | | | Minor corrections in compatmap.qdoc Task-number: QTBUG-32173 Change-Id: Ic4f881449e65c2d6889f0e217d251214997a8a56 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Clean up SensorGesture QML exampleTopi Reinio2013-11-045-71/+80
| | | | | | | | | | | | | | | | | | | | Fix warnings, fix property names and strings shown in the UI. Also touch the documentation and correct a typo in the qdoc file name. Task-number: QTBUG-33877 Change-Id: Ie790708ac4d1f8d72af03b52ee361d0bf3994adc Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * Unambiguous example nameAndreas Holzammer2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | For the example a QML plugin with the same name is created, which just differs in case. Windows does not support case sensitive files/folders. So QNX compile under windows fails. Change-Id: I20283fd9ebb125475c5e7ba19a35a67569785c69 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * grue example: Set qmldir.path correctly.Dmitry Shachnev2013-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | It should be $$DESTPATH, not $$DESTDIR, otherwise the build will install files to wrong locations like debian/tmp/build/buildd/... when building Debian packages. Change-Id: Iae1bd2d190dd1653f06d0f043f1b701b7cb46eb4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
| * BlackBerry: Disabled "returnGeoValues" featureBernd Weimer2013-10-282-36/+15
| | | | | | | | | | | | | | | | Elimination of interference is not supported on BlackBerry, so returnGeoValues property will be ignored. Change-Id: I5c6e3a80ec18f9e0d349d3c4040bfb8067a72291 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-2426-74/+183
|\| | | | | | | Change-Id: I78c9a02406695ce145b93a46cfa60961e40fc2dc
| * static linking: add classname to qmldirRichard Moe Gustavsen2013-10-231-0/+1
| | | | | | | | | | | | | | | | | | The new qmlimportscanner for static linking depends on the qmldir reporting the classname of the plugins. So add that to sensors as well. Change-Id: I80fd0a1d705ef589268231e6399f612a74b70828 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * make sensorfw plugin handle the sensord restarting.Lorn Potter2013-10-2325-74/+182
| | | | | | | | | | | | | | | | | | | | This way, clients that are connected will continue to receive updates after the sensord has restarted, without the need to restart the sensor. Task-number: QTBUG-34050 Change-Id: I4a8fbca189764cf23a1453feae5c1fd9ed6911e7 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-09-3021-39/+39
|\| | | | | | | Change-Id: I640479e743c2707eff3129e94726989330ea3148
| * Doc: Removed QML version from \inqmlmodule and put it in \qmlmodulev5.2.0-beta1Jerome Pasion2013-09-2721-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | -QDoc uses \qmlmodule to determine version -QDoc ignores versions in \inqmlmodule but it is better to remove the version to avoid confusion Task-number: QTBUG-32172 Change-Id: Iccab6b3fe201e8f01ddf130cd985bc0482425bf5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Bump qtsensors version to 5.3.0Thiago Macieira2013-09-251-1/+1
|/ | | | | Change-Id: I3e3b93d3aff2e619aa662fec6faf0d11d36e5f1d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Sergio Ahumada2013-09-201-1/+1
|\ | | | | | | Change-Id: I24286cf6c037f10fbbfb6c7e3c7145ebb38c01ed
| * [Doc] Fix the SensorGlobal usage exampleold/5.1Gatis Paeglis2013-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If qml type is registered with qmlRegisterSingletonType(), for example: qmlRegisterSingletonType <QmlSensorGlobal>(package, major, minor, "QmlSensors", global_object_50); where: package = "QtSensors" major = 5 minor = 0 Then it can be accessed like this: import QtSensors 5.0 as Sensors var types = Sensors.QmlSensors.sensorTypes(); Task-number: QTBUG-33558 Change-Id: I228fb51e8a2887c59ac8edba1a944a9b2c6ec05f Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | BlackBerry: Ensured that proper sensor.h file is usedBernd Weimer2013-09-192-3/+7
| | | | | | | | | | Change-Id: I746cbf971b88cdffcfc5d675d27d0dda5bac95ad Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Android: Add missing sensorsPaul Olav Tvete2013-09-1912-11/+438
| | | | | | | | | | | | | | | | | | This adds Android backends for QAmbientTemperatureSensor, QPressureSensor and QProximitySensor. Task-number: QTBUG-30531 Change-Id: I8d97f62d007c886fcc8dd701e23f6a35a3cbd748 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2013-09-0612-74/+125
|\| | | | | | | Change-Id: Ie5c68600ed2b7d6145497dcbceae5f320f7eea6f
| * Remove the explicit core/gui explicit QT addition for the gestures exampleLaszlo Papp2013-09-061-1/+1
| | | | | | | | | | Change-Id: Ie3087e97815ee59df4af732ce3b663ad283966bf Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Doc: Update Grue Sensor exampleTopi Reinio2013-08-1411-73/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a number of issues with the example: - Add \omit to generated doc sections, we don't want qdoc to process these (not part of Qt docs) - Combine the 5 separate examples into a single \example and discuss each subproject in a subsection - Add example image to doc - Fix deployment/build target directories and import paths - Define a 'reading' property for the sensor to make it work on QtSensors 5.1 - Fix the Grue QML application to avoid flicker from frequent updates. Task-number: QTBUG-32881 Change-Id: I2785faead1baaf5b1ae9d05df3398e018e945418 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Define the sensor coordinate system unambiguouslyPaul Olav Tvete2013-09-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | All illustrations in the documentation show devices with phone form factors, i.e. portrait orientation. Some tablets have a native landscape orientation. It is not clear from the documentation if the sensor coordinate system should be relative to the portrait orientation or the native orientation. This change defines the native orientation as the canonical orientation. Task-number: QTBUG-32144 Change-Id: I870cb3c9b5aec04f2ed8394a4407b53b888e82c3 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann2013-08-131-1/+0
| | | | | | | | | | Change-Id: I88413d1007744426dc7bd36d6986e05411d59a35 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-129-30/+58
|\| | | | | | | Change-Id: I7a9c32e8314fe1f753e40464cc5fbd16895c3665
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-08-099-30/+58
| |\ | | | | | | | | | Change-Id: Ie0fd1cdeb9cc4eba373852bf2087fcf229a7339c
| | * Updated the example to use SVG content and Qt Quick controls.v5.1.1Venu2013-08-029-30/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using sensors module and svg content in a Qt Quick app has been tricky so far as the C++ plug-in dependencies are not detected automatically by creator. This change is intended to make the app suitable for a tutorial explaining how to create a Qt Quick app for Android. Change-Id: I05b7413b1224e009ae739cf7a16181519cab7619 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | Merge branch 'stable' into devSergio Ahumada2013-08-054-3/+30
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
| * | add gyroscope for sensorfw backendLorn Potter2013-08-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32754 Change-Id: I9037c20953d67584fdfeb4d0fabdfd73f919f14c Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | use 9.80665 as standard gravity for calculations.Lorn Potter2013-08-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-32751 Change-Id: I65076fa41d5c6a4e716df96bc5156068c1bd0040 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-262-1/+28
| |\| | | | | | | | | | Change-Id: I02b963a3905fd55b1fc8e1d2204ffaee584eaa56
| | * Add changes-5.1.1 fileSergio Ahumada2013-07-251-0/+25
| | | | | | | | | | | | | | | Change-Id: I6bcc56af5bd19e1e6a9c15719e310461bc8dc1fd Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| | * Undefine near if it is already defined to prevent a build issueAndy Shaw2013-07-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some Windows Embedded 7 SDKs near is still defined, so we need to undefine it in those cases. Task-number: QTBUG-32571 Change-Id: I0d48b9dafa2af31f88f48746bfcf4df9fe824554 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: Ib467832043763d292bbe7d227e8d4a4966d74630 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-1/+1
| | | | | | | | | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: Ib3f6def889dddd7c92d0dc943424124af4aa8b09 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Enable the Grue sensor plugin no matter what other sensor plug-in is installedAlex Blasche2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | If multiple plugins with the same key are installed only the first one is used and any subsequent plugin with the same key is ignored. This prevents the Grue example from working as it requires a Light sensor and the Grue sensor. All other plug-ins use the "unused" key. Change-Id: I3cb28d3ffec407fb27b4550521acf28bd9c7b073 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-129-7/+8
|\| | | | | | | Change-Id: Id44a93ddf8dc778f44e9684842a759d585558ee4
| * Initialize active variable in doubletap gestureLorn Potter2013-07-121-0/+1
| | | | | | | | | | | | | | Fixes flakiness. Change-Id: I6e8beaf5106c4dd1e26c3bf038ba9e394d0f080d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-07-032-1/+4
| |\ | | | | | | | | | Change-Id: I08bb0d6a9d4b0dddf76f463c32b3a4efdd632f0d
| | * Freefall gesture needs to be initialized into plugin to be usableLorn Potter2013-07-032-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the flaky unit test failures. It also adds freefall to unit test. Task-number: QTBUG-32108 Change-Id: Ia1ee852b1e57b937fd7368073e259a139da9a697 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-256-6/+3
| |\| | | | | | | | | | Change-Id: I451682790ba1949c150d4045baf9df0cd467d486
| | * Fix loading of all sensorgesture plugins.v5.1.0-rc2v5.1.0Lorn Potter2013-06-226-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the change in qtbase 732dcfe7, only the first sensorgesture plugin was actually being loaded. Since the FILE argument of Q_PLUGIN_METADATA is optional, removing that and the json file fixes the following bugs: QTBUG-31900 QTBUG-31901 Change-Id: I7c0b67605a8fe680c37639f08926140e137dbe66 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Doc: Setting navigation bar variables.Jerome Pasion2013-06-271-0/+4
| | | | | | | | | | | | | | | Change-Id: I3072c467f9e1d08d5e2869ebdb272d185e612f97 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | iOS: change magnetometer implementation to use Timer base pollingRichard Moe Gustavsen2013-06-122-83/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref change: 102bdf3 We need to change the implementation to use polling rather than callback to achieve full performance together with fine-grained QTimers. Change-Id: Ic3bf978633c56175eeca90cad8ed764a0b1c9b0c Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* | | iOS: change gyro implementation to use Timer base pollingRichard Moe Gustavsen2013-06-102-35/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ref change: 102bdf3 We need to change the implementation to use polling rather than callback to achieve full performance together with fine-grained QTimers. Change-Id: I895418996b53432642d37279855167d815261d92 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | | Merge branch 'stable' into devSergio Ahumada2013-06-0732-262/+333
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c
| * | 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>