summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensorgestures/shake
Commit message (Collapse)AuthorAgeFilesLines
* Replace Q_DECL_OVERRIDE by overrideAlexander Volkov2016-12-022-8/+8
| | | | | | | 'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter <lorn.potter@canonical.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-5/+4
|\ | | | | | | | | | | | | Conflicts: src/sensors/doc/src/compatmap.qdoc Change-Id: I7bd464cbd506f630798091fef3896050ade7b3f8
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-5/+4
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ia3c3f69505650fd35982fc76e385e744b877e4df Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-204-56/+80
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: Id129b1497aa9d61fd16332e3b324f28dcf7bdd5b Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-174-28/+28
| | | | | | | | | 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 license headers and add new licensesJani Heikkinen2014-08-244-76/+44
| | | | | | | | | | | - 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>
* fix obs buildLorn Potter2014-05-203-3/+3
| | | | | Change-Id: Ia70486a0c6b813829ffd633f5334945f73d3b628 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* add PLUGIN_CLASS_NAME declarations to plugin projectsOswald Buddenhagen2014-04-091-0/+2
| | | | | | | | | | | needed for automatic static linking (and later deployment). the gesture plugins are excluded from the automation based on the assumption that they are usually not needed. the example and the test plugin are also excluded for obvious reasons. Change-Id: I7645aa0daf216ce430989e13d4380dbe6dd2bbd1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make QtSensors use Q_DECL_OVERRIDESamuel Gaist2013-11-192-8/+8
| | | | | | | | | 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>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-252-2/+1
|\ | | | | | | Change-Id: I451682790ba1949c150d4045baf9df0cd467d486
| * Fix loading of all sensorgesture plugins.v5.1.0-rc2v5.1.0Lorn Potter2013-06-222-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* It's org.qt-project for plugin interfacesLorn Potter2012-11-291-1/+1
| | | | | Change-Id: I4b442f25f4593f2d957ff572b5ec565ff952818b Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* remove Nokia isms from plugin interfaceLorn Potter2012-11-281-1/+1
| | | | | | | As well as from documentation and usage of Sensors.conf location Change-Id: I52d657d6799e44a94b3f37bae86445c73e176103 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* adjust to qt_plugin.prf and qml_plugin.prf changesOswald Buddenhagen2012-11-021-5/+1
| | | | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. this contains a nasty hack for examples, as we don't want users to use the internal prf files. Change-Id: I9e854e7ff6183e19801998ff7157a279b97b2be4 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-244-96/+96
| | | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I85014238e262cb59d8d92b0d708851e82e5633da Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-131-2/+0
| | | | | Change-Id: Ieaa07fcaf28f754c14774dee61697624d33cabf8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-1/+1
| | | | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - pointless DEFINES+=QT_MAKEDLL - pointless include and depend paths Change-Id: I2c5062c238c6948f99d72f7c5544095cd30c988d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* fix up gestures for auto test dataLorn Potter2012-05-112-12/+28
| | | | | | | | | | slam and other gestures need to be performed the way the test data shows. slam is effected the most as now the gesture needs no hold at end to be recognized, in accordance with data collected. Change-Id: Iedfcf8e42def0b1dfe1c4d289a416ca64d8846e1 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* Add required meta to the gesture plugin .pro filesLincoln Ramsay2012-05-091-3/+4
| | | | | | | | | | | Looking at the sensor plugins, it seems we need to load(qt_module) and load(qt_plugin) instead of the other things these were doing. Also, QT = core sensors because these plugins have no dependency on QtGui so we don't want to link that in. Change-Id: Id0560b0da39e6d2a7ed8619545189446324f69c0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* qshake[2]recognizer: Fix MSVC compiler warnings.Friedemann Kleint2012-03-231-3/+8
| | | | | | | | Warnings about conversion from qreal to bool, which is unintended. Change-Id: Iab668747d5d7cdeda57f934b90991e7b00914eac Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Use the new plugin mechanism for Sensors and SensorGesturesLincoln Ramsay2012-03-164-4/+6
| | | | | | | | | | | | | | Plugins no longer use QFactoryInterface or Q_EXPORT_PLUGIN. Instead, Q_PLUGIN_METADATA is used. Meta-data is provided through a .json file that is embedded into the plugin by moc. For now, this meta-data is not actually used because both sensors and gestures use a dynamic registration mechanism. Change-Id: Ic82657e2ba5768127e13f7411ca51f60772781d8 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* share sensors among the recognizers in QtSensors recognizer.Lorn Potter2012-03-011-1/+0
| | | | | Change-Id: Ie08046de2e293b8b6271851ce8b740832a6de315 Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Build fixYuchen Deng2012-02-151-3/+3
| | | | | | | | | | | error C2668: 'abs' : ambiguous call to overloaded function could be '__int64 abs(__int64)' or 'long abs(long)' or 'int abs(int)' while trying to match the argument list '(qreal)' Change-Id: Ie279096145d3d1cd5cd689555d70508f068f5f47 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* try harder to make sure gesture dont fire too easilyLorn Potter2012-02-012-74/+52
| | | | | | | | | some gestures will fire when trying other gestures. Make sure they don't collide and provide false positives as much. Change-Id: I4abd7d9ee876b77a211ae1b46bcc56f4fdc64ec0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-304-4/+4
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I1ecfbf66a49bb91dd995d92c871ca36148adc645 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-234-4/+4
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ie8628548cde5d3b251f319cbb6f33e6c08852d9e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* add new sensor gesturesLorn Potter2012-01-121-2/+1
| | | | | | Change-Id: Ided28e5d26af383b019d84ebb128c8ec6d6e3d34 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-054-4/+4
| | | | | | Change-Id: I7fdedc329cf80f84f1f6e0c6c9da3f7d1ebcd70d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* add z and y axis accumulation for shake as well.Lorn Potter2011-12-062-26/+33
| | | | | | Change-Id: If20750a1772da7fc7dc3665f68950c5c0aa6d30c Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* remove qmobilitypluginsearch and use the QFactoryLoader instead.Lorn Potter2011-11-141-2/+3
| | | | | | Change-Id: Ifdd2031d309a5ac4cbeedc5d7cdb6ba9cbb845c3 Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com> Sanity-Review: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* add QSensorGestures API. Long live QSensorGestures!Lorn Potter2011-11-015-0/+420
Change-Id: Iada4e8888aad8b7b2180cc0bfb8576a766f75b24 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>