summaryrefslogtreecommitdiffstats
path: root/src/nfc/qnearfieldtarget_android.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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