summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-29Bump package version to 5.2.2submit/tizen_ivi_release/20140312.071350submit/tizen/20140312.070920submit/tizen/20140226.110255submit/tizen/20140129.151607accepted/tizen/mobile/20140227.072206accepted/tizen/ivi/release/20140312.115917accepted/tizen/ivi/panda/20140312.103837accepted/tizen/ivi/20140226.204805accepted/tizen/ivi/20140129.181029accepted/tizen/generic/20140312.114942accepted/tizen/generic/20140226.134730accepted/tizen/generic/20140129.173508tizen_ivi_releaseaccepted/tizen_ivi_releaseaccepted/tizen/iviaccepted/tizen/genericTomasz Olszak1-1/+1
Tizen-Bug: TIVI-2416 Change-Id: I2633eadb4ba2daec7fb9e551c617e9611447fed6 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-01-29Bump package version to 5.2.1Tomasz Olszak1-1/+1
Change-Id: Ia601967bb571ba6280971cc702a8b1893a114f1e
2014-01-29Spec adapted for TizenTomasz Olszak1-29/+54
2014-01-29Import from MerTomasz Olszak1-0/+151
2014-01-28Merge remote-tracking branch 'origin/stable' into wip/tizenupstream/5.2.2Tomasz Olszak2-3/+3
Change-Id: Ifa86ebf1f11cf307d8f4a0dedea7c7b6119011e7
2014-01-16Use correct method signature for slots.Michael Brasser1-2/+2
Change-Id: I09b5df218ad22afefe8a615c80585aa3fb46006f Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
2014-01-16Bump MODULE_VERSION to 5.2.2Sergio Ahumada1-1/+1
Change-Id: Ic173a32836639e664e8349b28b101ee26a45ff78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-12-17Merge remote-tracking branch 'origin/stable' into wip/tizenupstream/5.2.1Tomasz Olszak4-2/+80
Change-Id: I633d085ec266d619f6d66d376d1c4785379c49bc
2013-12-13Fix code snippet in Qt Sensors QML Types documentation.Mitch Curtis1-2/+2
Change-Id: I5639fb872b8e41cc5c5b5968cf1ddf7e247961e2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-12-12Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn1-0/+71
Change-Id: I61deffeb7b61a4157b9ecb77de35f08d47c4e9bd
2013-12-05Update QtSensor changelog for 5.2Alex Blasche1-0/+71
Change-Id: I22dbe4447c14c48bfc812cc8fb5543d5f0fa872f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-26Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2-0/+7
Change-Id: I11d540f43baa69f9e857dd793666c1008b217956
2013-11-25Merge remote-tracking branch 'upstream/stable' into wip/tizenTomasz Olszak65-174/+178
Change-Id: Ie82cf5e0565de901e8bca85b01dca17c26982be2
2013-11-25Bump MODULE_VERSION to 5.2.1Sergio Ahumada1-1/+1
Change-Id: I5082d09607f08c4daad72a8530f7f76feac397fa Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-21QML examples: Avoid using release/debug output subdirectoryTopi Reinio2-0/+7
Qt Sensors examples that include additional QML modules fail to run on Windows, because the application located under a debug or release subdirectory does not see the module import path. This change fixes the issue by adjusting examples' DESTDIR on Windows builds. Task-number: QTBUG-33875 Change-Id: Iab8ebc1acd80cf4fe88a7a35b44c42f767da5ccf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-11-19Make QtSensors use Q_DECL_OVERRIDESamuel Gaist64-173/+177
This patch aims to make QtSensors uses Q_DECL_OVERRIDE uniformly across the module Task-number: QTBUG-27392 Change-Id: I5f814f93307159175f92e29a9990587c03cce96f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2013-11-13Merge remote-tracking branch 'upstream/stable' into wip/tizenTomasz Olszak38-893/+467
Change-Id: I95f1e559fb6f8fce6ecd1db22086752b2d884ed1
2013-11-11Doc: Update Sensor Explorer exampleTopi Reinio19-698/+251
Following changes are made to the example - Use of Qt Quick Controls / TableView to present the sensor information, reducing the example to a single QML file - Updated launcher main.cpp for the QML example - Remove separate example doc for the import subproject - Various fixes to example doc, add a screenshot - Ensure import module + qmldir are built/deployed to correct location Task-number: QTBUG-32881 Task-number: QTBUG-33875 Change-Id: I0ed7c7ebc916fcad6da5e3c66d81be8f348a93e1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-11-06Doc: Updated url variable in qdocconf files.Jerome Pasion1-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>
2013-11-04Doc: review of QtSensorsNico Vertriest11-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>
2013-11-04Doc: Clean up SensorGesture QML exampleTopi Reinio5-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>
2013-11-04Unambiguous example nameAndreas Holzammer1-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>
2013-10-30grue example: Set qmldir.path correctly.Dmitry Shachnev1-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>
2013-10-29Merge remote-tracking branch 'upstream/stable' into wip/tizenTomasz Olszak28-110/+198
Change-Id: I4603e34fa26e62ab53c6f0d26b2a84fe5f240748
2013-10-28BlackBerry: Disabled "returnGeoValues" featureBernd Weimer2-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>
2013-10-23static linking: add classname to qmldirRichard Moe Gustavsen1-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>
2013-10-23make sensorfw plugin handle the sensord restarting.Lorn Potter25-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>
2013-10-04Added tizen sensors pluginTomasz Olszak22-0/+1839
Change-Id: Ib455e5c53be47ae4910f56b5b714a4a44e6a8fb3 Reviewed-by: Witold Wysota <wysota@qtcentre.org> Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2013-09-27Doc: Removed QML version from \inqmlmodule and put it in \qmlmoduleJerome Pasion21-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>
2013-09-20Merge remote-tracking branch 'origin/stable' into devSergio Ahumada1-1/+1
Change-Id: I24286cf6c037f10fbbfb6c7e3c7145ebb38c01ed
2013-09-20[Doc] Fix the SensorGlobal usage exampleGatis Paeglis1-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>
2013-09-19BlackBerry: Ensured that proper sensor.h file is usedBernd Weimer2-3/+7
Change-Id: I746cbf971b88cdffcfc5d675d27d0dda5bac95ad Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2013-09-19Android: Add missing sensorsPaul Olav Tvete12-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>
2013-09-06Merge remote-tracking branch 'origin/stable' into devSergio Ahumada12-74/+125
Change-Id: Ie5c68600ed2b7d6145497dcbceae5f320f7eea6f
2013-09-06Remove the explicit core/gui explicit QT addition for the gestures exampleLaszlo Papp1-1/+1
Change-Id: Ie3087e97815ee59df4af732ce3b663ad283966bf Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
2013-09-03Define the sensor coordinate system unambiguouslyPaul Olav Tvete1-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>
2013-08-14Doc: Update Grue Sensor exampleTopi Reinio11-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>
2013-08-13Remove unnecessary dependency to qtjsbackend from sync.profileSimon Hausmann1-1/+0
Change-Id: I88413d1007744426dc7bd36d6986e05411d59a35 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-08-12Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn9-30/+58
Change-Id: I7a9c32e8314fe1f753e40464cc5fbd16895c3665
2013-08-09Merge remote-tracking branch 'origin/release' into stableSergio Ahumada9-30/+58
Change-Id: Ie0fd1cdeb9cc4eba373852bf2087fcf229a7339c
2013-08-05Merge branch 'stable' into devSergio Ahumada4-3/+30
Conflicts: .qmake.conf Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
2013-08-02Doc: Setting \qtvariable in module page.Jerome Pasion1-1/+1
\qtvariable indicates the QT variable needed in .pro files. Change-Id: Ib3f6def889dddd7c92d0dc943424124af4aa8b09 Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-08-02Updated the example to use SVG content and Qt Quick controls.Venu9-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>
2013-08-01add gyroscope for sensorfw backendLorn Potter1-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>
2013-08-01use 9.80665 as standard gravity for calculations.Lorn Potter1-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>
2013-07-29Enable the Grue sensor plugin no matter what other sensor plug-in is installedAlex Blasche1-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>
2013-07-26Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2-1/+28
Change-Id: I02b963a3905fd55b1fc8e1d2204ffaee584eaa56
2013-07-25Add changes-5.1.1 fileSergio Ahumada1-0/+25
Change-Id: I6bcc56af5bd19e1e6a9c15719e310461bc8dc1fd Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
2013-07-24Bump MODULE_VERSION to 5.1.2Sergio Ahumada1-1/+1
Change-Id: Ib467832043763d292bbe7d227e8d4a4966d74630 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-23Undefine near if it is already defined to prevent a build issueAndy Shaw1-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>