Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/5.6' into 5.7 | Liang Qi | 2016-08-01 | 1 | -0/+5 |
|\ | |||||
| * | Make sure JNI_OnLoad is not called more than once | BogDan Vatra | 2016-07-20 | 1 | -0/+5 |
* | | Updated license headers | Antti Kokko | 2016-01-20 | 1 | -14/+20 |
|/ | |||||
* | Using QtAndroidExtras instead of Andoid JNI for NFC | Peter Rustler | 2015-03-19 | 1 | -99/+11 |
* | Add the feature to get the nfc intent that startet the app | Peter Rustler | 2015-03-18 | 1 | -0/+11 |
* | Bugfix: Call stopDiscoveryId in stopDiscovery. | Peter Rustler | 2015-03-18 | 1 | -1/+1 |
* | Adapt to the new "onResumePause" API | Peter Rustler | 2015-03-18 | 1 | -6/+5 |
* | Update Digia headers to QtCompany headers | Alex Blasche | 2015-03-02 | 1 | -21/+13 |
* | Adapt to the new "onNewIntent" API | Peter Rustler | 2015-02-02 | 1 | -34/+5 |
* | Squashed code contribtion for QtNfc on Android | Juhana Jauhiainen | 2015-01-08 | 1 | -0/+214 |