summaryrefslogtreecommitdiffstats
path: root/src/nfc/qnearfieldsharetarget.h
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-211-1/+1
|\
| * Add explicit and make public headers compile with -Wzero-as-null-pointer-cons...Marc Mutz2016-03-151-1/+1
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/
* Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-161-1/+1
|\
| * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-121-1/+1
* | Update copyright headersJani Heikkinen2015-02-161-6/+6
|/
* Update license headers and add new licensesJani Heikkinen2014-08-241-18/+10
* Fix qmake and compiler warningsAlex Blasche2014-02-141-2/+1
* Add support for NFC file and data sharingStuart Burge2014-02-131-0/+87