summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Expand)AuthorAgeFilesLines
* Fix GCC 7 warnings about implicit fallthroughsThiago Macieira2017-05-191-2/+2
* Fix build for -no-feature-textcodecStephan Binner2017-04-251-0/+10
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-241-1/+1
* Fix undocumented parameter warning from qdocAlex Blasche2017-04-061-3/+4
* NFC on Android: Fix crash on restart of an app in debug buildv5.9.0-beta1Lars Schmertmann2017-03-162-1/+4
* Fix unused parameter warningAlex Blasche2017-03-131-0/+1
* NFC on Android: Fix crash on restart of an appLars Schmertmann2017-03-081-0/+4
* QNearfieldTarget: Introduce (set)keepConnection() and disconnect()Lars Schmertmann2017-01-188-101/+265
* Avoid code duplication by using checksum calculation from qtbaseLars Schmertmann2017-01-144-35/+20
* Android: QNearfieldTarget: Introduce maxCommandLength()Lars Schmertmann2017-01-039-6/+214
* Android: Add support for sendCommand to QNearFieldTargetLars Schmertmann2016-12-163-31/+56
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-242-0/+3
|\
| * Fix ODR violation in QLlcpServer on AndroidAlex Blasche2016-11-082-0/+3
* | Prepare QtNfc for Android Service supportAlex Blasche2016-08-311-0/+3
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-0/+10
|\|
| * Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| * Android: Workaround clang default destructor export bugBogDan Vatra2016-07-192-0/+5
* | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-06-091-1/+8
|\|
| * QNearFieldTagType1Private: take more care over m_tlv{Writ,Read}er.Edward Welbourne2016-05-311-1/+8
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\|
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-064-5/+15
|\|
| * Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-132-5/+6
| * Fix Annotated URL Example on AndroidAlex Blasche2016-04-132-0/+9
* | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-291-1/+1
* | Remove simulator support for NFCRainer Keller2016-04-057-776/+0
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-216-10/+13
|\|
| * Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| * 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