summaryrefslogtreecommitdiffstats
path: root/src/nfc/qllcpserver_android_p.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-011-0/+1
|\
| * Android: Workaround clang default destructor export bugBogDan Vatra2016-07-191-0/+1
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-091-0/+11
* Update Digia headers to QtCompany headersAlex Blasche2015-03-021-21/+13
* Squashed code contribtion for QtNfc on AndroidJuhana Jauhiainen2015-01-081-0/+83