summaryrefslogtreecommitdiffstats
path: root/src/nfc/qnearfieldtarget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Changing the way nfc target detection worksFabian Bumberger2013-09-191-3/+0
| | | | | | | | | On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use. This patch removes the parameters used for target detection. Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qdoc warningsAlex Blasche2013-09-161-7/+5
| | | | | Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-091-2/+2
| | | | | | | | This is based on namespace discussions on the Qt project dev mailing list. We continue to use the Qt namespace. Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Move qNfcChecksum() definition into a .cpp fileSze Howe Koh2013-09-091-2/+23
| | | | | | | | | | | The function is public; doesn't make sense to implement it in a private header. This patch also resolves the multiply-defined-symbols issue when trying to build some Qt NFC autotests without the "QtNfc" namespace. Change-Id: I4ba1dc31d93bb66454c7dcd043c18f81dc2ad680 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fixing QNearFieldTarget::waitForRequestCompletedFabian Bumberger2013-07-101-3/+14
| | | | | | | | | | | | The current implementation is not waiting at all. Adjust the waiting time for the tagtype1 unit test to avoid 30min runtime. Change-Id: Ied9cff72456b964af9224362f47113a7e2c792ae Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Fix QNearFieldTarget::AccessMethods flags to permit OR concatenationAlex Blasche2013-06-271-0/+1
| | | | | | | | | | | Adds an UnknownAccess enum value for tag types not yet known by the library/backend. Task-number: QTBUG-26027 Change-Id: Ic7654c0906b22bbd5c71bafd3e90a924bf913e23 Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Update Copyright headersAlex Blasche2013-06-251-1/+1
| | | | | | | | | - Update Digia's copyright year - Add copyright to files without it - Convert old BSD to new LGPL license for auto test code Change-Id: I47f5c871c436f9c2731b235026434448719cc671 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-141-2/+2
| | | | | | | | Renamed to the namespace macros to follow what syncqt expects. This fixes missing namespace macro warnings printed by syncqt. Change-Id: I7be5a700e8435a559cb4c2e74938851233095887 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Further porting of NFC module from mobility to Qt 5.Aaron McCarthy2012-10-011-2/+0
| | | | | | | | | | | | | | | | | | | Includes the following changes: * Conditionally enables building of the NFC module when qmake is run with CONFIG+=nfc. * Correctly build within the QtNfc namespace. * Fix compile errors in examples, enable building of NFC examples. * Fix compile errors in tests, enable building of NFC tests. Mark the some NFC tests as insignificant as they currently crash. Notably does not enable NFC documentation generation. Task-number: QTBUG-22015 Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015 Reviewed-by: Alex <ablasche@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-24/+24
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4f07028d0bf0b3ba4c4649897b80687ea5e51abc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* No more NFC on Symbian.alex2012-02-281-5/+0
| | | | | | Change-Id: Id1355d5c7a56de3b031945f226d9c52897020c8b Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | 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: I84f8c423bd7748bbae495fedae696990414cee83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added documentation and examplesMichael Zanetti2012-01-231-2/+1
| | | | | | Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc Reviewed-by: Alex <alex.blasche@nokia.com> Sanity-Review: Alex <alex.blasche@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-201-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-051-1/+1
| | | | | | Change-Id: I76920b22a5b386a0f85ec28076da20505c022b6f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added Connectivity namespaces (QtBluetooth and QtNfc)Michael Zanetti2011-11-111-1/+5
| | | | | | Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Use QAtomicInt::load() instead of implicit int castingBradley T. Hughes2011-11-031-1/+1
| | | | | | | | The operator int() cast operator is deprecated and will be removed. Change-Id: I0cce705303542dad0d96a8db5c26859a806f5965 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Add missing license headers.Jason McDonald2011-09-081-17/+17
| | | | | | Change-Id: I09b06e50437a47cfd33562d30a55c07154977cd0 Reviewed-on: http://codereview.qt-project.org/4381 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Initial commit.Michael Zanetti2011-08-241-0/+464
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834