summaryrefslogtreecommitdiffstats
path: root/src/connectivity/nfc
Commit message (Expand)AuthorAgeFilesLines
* Update copyright year in Digia's license headersSergio Ahumada2013-01-10122-130/+130
* Update to new license formatSergio Ahumada2012-11-07122-2688/+2688
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-07122-368/+368
* Fix handling of type 4 tag specific command replies on SymbianJuha Kukkonen2012-09-101-0/+5
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-connectivityjennifzh2011-11-112-9/+110
|\
| * NDEF message handlers are required to be single instance.Aaron McCarthy2011-11-071-2/+4
| * Fix ndefhandlergen help output.Aaron McCarthy2011-11-071-2/+2
| * Replace non-ascii character.Aaron McCarthy2011-11-071-1/+1
| * Removed duplicate documentation for Meego ndefhandlergen usageJuha Kukkonen2011-11-041-7/+0
| * Improved documentation for NFC auto-start in SymbianJuha Kukkonen2011-11-041-2/+4
| * Improved documentation of QNearFieldManager::startTargetDetection method.Tarmo Lehto2011-10-211-4/+9
| * Document that naming requirements for NFC auto-start.Aaron McCarthy2011-10-211-0/+14
| * Fix NDEF handler documentation for MeeGo 1.2 Harmattan.Aaron McCarthy2011-10-121-4/+4
| * Register NDEF handers on the session bus.Aaron McCarthy2011-09-052-7/+6
| * Add single quotes around NDEF type.Aaron McCarthy2011-08-311-2/+2
| * Docs: restore Harmattan doc.Peter Yard2011-08-291-1/+87
* | Fix for Case 885082: QNearFieldManager::isAvailable() returns true when NFC i...jennifzh2011-08-252-6/+30
|/
* Request target.detect access when starting target detection.Aaron McCarthy2011-08-121-2/+21
* Fix crash caused by accessing invalid iterator.Aaron McCarthy2011-08-121-3/+1
* Fix emission of multiple targetDetected() signals.Aaron McCarthy2011-08-102-7/+29
* Reconnect to nfcd if not currently connected.Aaron McCarthy2011-07-112-37/+140
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframeworkPeter Yard2011-07-0611-158/+330
|\
| * Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-302-34/+34
| * Correctly emit signal when request is denied.Aaron McCarthy2011-06-241-0/+1
| * Only transmit one frame for each call to write.Aaron McCarthy2011-06-201-14/+12
| * Don't automatically turn on NFC hardware.Aaron McCarthy2011-06-151-2/+0
| * Set correct connection properties on server sockets.Aaron McCarthy2011-06-154-9/+10
| * Delay emission of bytesWritten() siganl.Aaron McCarthy2011-06-072-7/+38
| * LLCP connectionless sockets on Harmattan.Aaron McCarthy2011-06-072-25/+109
| * Update to latest DBus API.Aaron McCarthy2011-06-078-78/+137
* | Docs: Remove references to Maemo6.Peter Yard2011-06-242-78/+3
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-bearermanageme...Qt Continuous Integration System2011-06-022-34/+34
|\
| * Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-012-34/+34
* | Merge remote branch 'origin/master' into connectivity/masterAaron McCarthy2011-06-012-15/+3
|\|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo...Qt Continuous Integration System2011-06-012-14/+3
| |\
| | * Docs: fix qdoc errors.Peter Yard2011-05-312-14/+3
* | | QML documentation.Aaron McCarthy2011-05-312-34/+149
|/ /
* | Merge remote branch 'origin/master' into connectivity/masterAaron McCarthy2011-05-31120-2044/+2044
|\ \
| * | Update licenseheader text in source files for qtmobilityJyri Tahtela2011-05-18120-2044/+2044
| |/
* | Merge remote branch 'origin/master' into connectivity/masterAaron McCarthy2011-05-1816-0/+16
|\|
| * Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-05-041-4/+8
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo...Qt Continuous Integration System2011-04-2016-0/+16
| |\ \
| | * \ Merge branch 'master' of ../qtmobilityAlex2011-04-1824-115/+217
| | |\ \
| | * | | Docs: QTMOBILITY-790 added since tag to 1.2 classes.Peter Yard2011-04-1516-0/+16
* | | | | Merge branch 'nfcsymbianbackend' of scm.dev.nokia.troll.no:qtmobility/qtm-con...Sean Fang2011-05-1711-55/+281
|\ \ \ \ \
| * | | | | Update to work with latest Maemo6 NFC DBus API.Aaron McCarthy2011-05-1711-55/+281
| | |_|_|/ | |/| | |
* | | | | verify tag type1 and tag type2 are working with new RawModeAccess API impleme...Sean Fang2011-05-171-1/+1
* | | | | rawmode access change for tag type 1 and 2Sean Fang2011-05-173-5/+10
|/ / / /
* / / / Pass strings properly to dbus.Aaron McCarthy2011-05-041-4/+8
|/ / /
* | | Fix Aaron's commit 1d1bedbd3d8 I thinkAndrew Stanley-Jones2011-04-191-4/+4