summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Expand)AuthorAgeFilesLines
...
* | Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-199-203/+78
* | Add the feature to get the nfc intent that startet the appPeter Rustler2015-03-184-1/+27
* | Bugfix: Exit updateReceiveState if we are paused and not receiving.Peter Rustler2015-03-181-3/+10
* | Bugfix: Call stopDiscoveryId in stopDiscovery.Peter Rustler2015-03-181-1/+1
* | Adapt to the new "onResumePause" APIPeter Rustler2015-03-184-11/+46
* | Update Digia headers to QtCompany headersAlex Blasche2015-03-0212-258/+162
* | Merge branch 'dev' into neardAlex Blasche2015-02-26113-752/+704
|\|
| * Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-162-3/+3
| |\
| | * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-162-3/+3
| | |\
| | | * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-121-1/+1
| | | * Use single-char QString operations for efficiencySergio Ahumada2015-02-111-2/+2
| * | | Update copyright headersJani Heikkinen2015-02-16113-749/+701
| |/ /
* | | Merge branch 'dev' into neardAlex Blasche2015-02-026-55/+115
|\| |
| * | Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()Alex Blasche2015-01-282-4/+4
| * | Disable writing of Ndef messages due to crash in Neard daemonAlex Blasche2015-01-131-0/+5
| * | Neard: fix tag writingMartin Leutelt2015-01-131-38/+59
| * | Improve some parts of the SmartPoster API docsAlex Blasche2014-12-112-5/+26
| * | Neard: Read all availabe SmartPoster dataAlex Blasche2014-12-111-7/+20
| * | Fix writing of NFC URI recordsAlex Blasche2014-12-111-2/+2
| * | Enable automatic tag polling if message handler is not supported.Alex Blasche2014-12-101-1/+1
* | | Initialize the handlerID for registerNdefMessageHandlerAlex Blasche2015-02-021-1/+1
* | | Fix compiler warning for unused variableAlex Blasche2015-02-021-1/+1
* | | Enable the Android code path for QtNfcAlex Blasche2015-02-021-10/+3
* | | Added support for nfc message handlersPeter Rustler2015-02-024-37/+106
* | | Insert newIntent listener if it is not already in list, onlyPeter Rustler2015-02-021-1/+2
* | | Adapt to the new "onNewIntent" APIPeter Rustler2015-02-024-36/+165
* | | Changed private nfc Android API to new QtNfc APIPeter Rustler2015-02-022-7/+3
* | | Cleanup of directory structure and pro files for NFC for AndroidPeter Rustler2015-02-021-1/+3
* | | Remove not needed public headerAlex Blasche2015-01-083-52/+5
* | | Squashed code contribtion for QtNfc on AndroidJuhana Jauhiainen2015-01-0813-1/+1988
|/ /
* | Merge branch 'dev' into neardAlex Blasche2014-11-2586-1571/+1215
|\|
| * Doc: Applied title case to section1 titlesNico Vertriest2014-10-092-3/+3
| * Add \since tag to NFC classes which didn't have the tag yetAlex Blasche2014-09-269-0/+9
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-2828-1/+308
| |\
| | * Add missing private headers warningSamuel Gaist2014-08-1828-1/+308
| * | Update license headers and add new licensesJani Heikkinen2014-08-2484-1566/+894
| * | Merge remote-tracking branch 'gerrit/5.4' into btleAlex Blasche2014-08-131-1/+0
| |\ \
| | * | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| * | | Merge branch 'dev' into btleAlex Blasche2014-05-2617-35/+42
| |\| |
| * | | Merge branch 'dev' into btleAlex Blasche2014-03-1413-70/+169
| |\ \ \
| * \ \ \ Merge branch 'dev' into btleAlex Blasche2014-02-1726-19/+1814
| |\ \ \ \
| * | | | | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-0/+1
* | | | | | Update documentation to reflect new Linux platform supportAlex Blasche2014-11-131-1/+1
* | | | | | Updated documentation to include neardMartin Leutelt2014-10-161-0/+12
* | | | | | Fixing crash when stopping poll loopLutz Schönemann2014-10-092-30/+32
* | | | | | QNearFieldManager::registerNdefMessageHandler returns -1 on errorAlex Blasche2014-10-091-1/+1
* | | | | | Neard: porting to neard v0.14Martin Leutelt2014-09-3028-447/+948
* | | | | | Neard: Implement tag writeFabian Bumberger2014-07-081-3/+75
* | | | | | Add neard ndef record parsingFabian Bumberger2014-07-025-10/+170
* | | | | | Implement tag detected and tag lost signalsFabian Bumberger2014-07-023-15/+72