summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Expand)AuthorAgeFilesLines
...
| * Add explicit and make public headers compile with -Wzero-as-null-pointer-cons...Marc Mutz2016-03-155-7/+7
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-5/+5
|\|
| * don't over-expose private dependenciesOswald Buddenhagen2016-02-251-3/+3
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
* | Disable simulator build.Christian Kandeler2016-02-231-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-162-0/+17
|\|
| * Document QtBluetooth and QtNfc logging categoriesAlex Blasche2016-01-151-0/+14
| * Fix qdoc warning about missing dtor documentation in QQmlNdefRecordAlex Blasche2016-01-151-0/+3
* | Doc: fix minor typoGabriel Pannwitz2016-02-041-1/+1
* | Updated license headersAntti Kokko2016-01-2085-1195/+1705
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2016-01-051-1/+1
|\|
| * Remove deprecated 'register' storage class specifier.Erik Verbruggen2015-12-231-1/+1
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-12-212-0/+6
|\|
| * Fix resource leak.Frank Meerkoetter2015-12-182-0/+6
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-11-112-2/+2
|\|
| * Doc: minor link issuesNico Vertriest2015-10-301-1/+1
| * Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
* | 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