summaryrefslogtreecommitdiffstats
path: root/src/nfc/qnearfieldtarget_android.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-211-5/+8
|\
| * Fix "QMetaObject::invokeMethod: No such method" for ndefMessageReadLars Schmertmann2018-07-171-5/+8
* | Introduce reportError to fix "QMetaObject::invokeMethod: No such method"Lars Schmertmann2018-07-171-27/+9
|/
* Fix "QMetaObject::invokeMethod: No such method"Lars Schmertmann2018-06-191-4/+6
* Android Qt NFC manager may not startAndrew O'Doherty2018-03-061-4/+4
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-211-2/+1
|\
| * Fix writing of NdefMessages on androidDaniel Engelke2017-10-241-2/+1
* | Normalize Q_ARG arguments (const modifier removed)Alex Blasche2017-11-031-14/+14
|/
* NFC on Android: Fix crash on restart of an app in debug buildv5.9.0-beta1Lars Schmertmann2017-03-161-0/+4
* QNearfieldTarget: Introduce (set)keepConnection() and disconnect()Lars Schmertmann2017-01-181-100/+152
* Android: QNearfieldTarget: Introduce maxCommandLength()Lars Schmertmann2017-01-031-3/+28
* Android: Add support for sendCommand to QNearFieldTargetLars Schmertmann2016-12-161-29/+52
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-061-4/+5
|\
| * Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-131-4/+5
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/
* Android Nfc: Use of StringLiteral instead of static const QStringPeter Rustler2015-03-191-39/+46
* Use AndroidExtras for all functions in qnearfieldtarget_androidPeter Rustler2015-03-191-93/+54
* Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-191-28/+17
* Update Digia headers to QtCompany headersAlex Blasche2015-03-021-21/+13
* Added support for nfc message handlersPeter Rustler2015-02-021-0/+3
* Squashed code contribtion for QtNfc on AndroidJuhana Jauhiainen2015-01-081-0/+496