summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-149-0/+99
|\|
| * Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-099-0/+99
* | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-251-2/+2
|/
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-296-4/+10
|\
| * Port from Q_ENUMS to new macro Q_ENUMKonstantin Ritt2015-06-236-4/+10
| * Remove main documentation stating Blackberry being supportedAlex Blasche2015-06-171-1/+1
* | Remove BlackBerry as supported platform from QtNfcAlex Blasche2015-06-1825-2911/+2
* | Fix qdoc warning due to wrong parameter name used in docsAlex Blasche2015-06-161-1/+1
* | Update list of supported platforms in QtNfcAlex Blasche2015-06-101-1/+3
* | Merge remote-tracking branch 'gerrit/5.5' into neardAlex Blasche2015-05-113-1/+14
|\|
| * Revert "qndefnfcsmartposterrecord.h: Fix build with headersclean check."v5.5.0-beta1Friedemann Kleint2015-04-211-4/+0
| * Add assignment operator to QNdefNfcSmartPosterRecord.Friedemann Kleint2015-04-212-0/+13
| * qndefnfcsmartposterrecord.h: Fix build with headersclean check.Friedemann Kleint2015-04-201-0/+4
| * Fix trailing commas in enumsAlex Blasche2015-04-201-1/+1
* | Added documentation for NFC on AndroidPeter Rustler2015-04-133-14/+125
* | Fix implementation of and improve NdefFilter usageStephan Binner2015-04-023-21/+100
* | Android Nfc: Use of StringLiteral instead of static const QStringPeter Rustler2015-03-192-47/+46
* | Use AndroidExtras for all functions in qnearfieldtarget_androidPeter Rustler2015-03-192-96/+57
* | Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-199-203/+78
* | Add the feature to get the nfc intent that startet the appPeter Rustler2015-03-184-1/+27
* | Bugfix: Exit updateReceiveState if we are paused and not receiving.Peter Rustler2015-03-181-3/+10
* | Bugfix: Call stopDiscoveryId in stopDiscovery.Peter Rustler2015-03-181-1/+1
* | Adapt to the new "onResumePause" APIPeter Rustler2015-03-184-11/+46
* | Update Digia headers to QtCompany headersAlex Blasche2015-03-0212-258/+162
* | Merge branch 'dev' into neardAlex Blasche2015-02-26113-752/+704
|\|
| * Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-02-162-3/+3
| |\
| | * Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-162-3/+3
| | |\
| | | * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-121-1/+1
| | | * Use single-char QString operations for efficiencySergio Ahumada2015-02-111-2/+2
| * | | Update copyright headersJani Heikkinen2015-02-16113-749/+701
| |/ /
* | | Merge branch 'dev' into neardAlex Blasche2015-02-026-55/+115
|\| |
| * | Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()Alex Blasche2015-01-282-4/+4
| * | Disable writing of Ndef messages due to crash in Neard daemonAlex Blasche2015-01-131-0/+5
| * | Neard: fix tag writingMartin Leutelt2015-01-131-38/+59
| * | Improve some parts of the SmartPoster API docsAlex Blasche2014-12-112-5/+26
| * | Neard: Read all availabe SmartPoster dataAlex Blasche2014-12-111-7/+20
| * | Fix writing of NFC URI recordsAlex Blasche2014-12-111-2/+2
| * | Enable automatic tag polling if message handler is not supported.Alex Blasche2014-12-101-1/+1
* | | Initialize the handlerID for registerNdefMessageHandlerAlex Blasche2015-02-021-1/+1
* | | Fix compiler warning for unused variableAlex Blasche2015-02-021-1/+1
* | | Enable the Android code path for QtNfcAlex Blasche2015-02-021-10/+3
* | | Added support for nfc message handlersPeter Rustler2015-02-024-37/+106
* | | Insert newIntent listener if it is not already in list, onlyPeter Rustler2015-02-021-1/+2
* | | Adapt to the new "onNewIntent" APIPeter Rustler2015-02-024-36/+165
* | | Changed private nfc Android API to new QtNfc APIPeter Rustler2015-02-022-7/+3
* | | Cleanup of directory structure and pro files for NFC for AndroidPeter Rustler2015-02-021-1/+3
* | | Remove not needed public headerAlex Blasche2015-01-083-52/+5
* | | Squashed code contribtion for QtNfc on AndroidJuhana Jauhiainen2015-01-0813-1/+1988
|/ /
* | Merge branch 'dev' into neardAlex Blasche2014-11-2586-1571/+1215
|\|
| * Doc: Applied title case to section1 titlesNico Vertriest2014-10-092-3/+3