summaryrefslogtreecommitdiff
path: root/src/nfc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-013-0/+10
|\ | | | | | | Change-Id: I64352b6cc066255972874e2f9c28abff35f0d613
| * Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: I2894dd24afa9c51582f20ab44d83e9ce86751716 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Android: Workaround clang default destructor export bugBogDan Vatra2016-07-192-0/+5
| | | | | | | | | | | | | | | | | | Somehow clang fails to properly export the default destructor. Should be revered when https://github.com/android-ndk/ndk/issues/143 is fixed. Change-Id: I842f4141f249181ec871634b947e1c08470ddb83 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-06-091-1/+8
|\ \ | |/ | | | | Change-Id: Id8dffff9bb75db396aabf6da2a3acb78505a6476
| * QNearFieldTagType1Private: take more care over m_tlv{Writ,Read}er.Edward Welbourne2016-05-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | The writer wasn't initialized; Coverity grumbled (CID 22323). Various stanzas take for granted that one or other is set; assert there. Various stanzas created each afresh, without considering they might be leaking a prior one; delete first (could probably have asserted == 0 instead). Change-Id: I4c792fbbd611e06c28235ceafee40cc18268c60d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-191-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia9bc69bf68eb40ceb9bd5bd63d96ab4dece43c00
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I8fc41af85033c88d6a3129efdb616dac6d99866d Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-064-5/+15
|\ \ | |/ | | | | | | | | | | Conflicts: examples/nfc/corkboard/corkboard.pro Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
| * Android: Suppress failed connect/close attempts due to targetLost detectionAlex Blasche2016-04-132-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android does not provide an API to detect when an NFC tag is removed from the vincinity. To detect such a case the Android implementation uses active polling. During each polling cycle the implementation connects and disconnects from the tag. If it failed, the tag is assumed to have been removed from the vincinity. Such failed attempts cause an IOException which are printed to stderr. This is confusing as the developer might mistake them for some other serious problem. This change suppresses all related warnings. Change-Id: I95cf57076139e7d0a5ad31d4cc770a81ced12242 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix Annotated URL Example on AndroidAlex Blasche2016-04-132-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNearFieldManager::registerNdefMessageHandler() is supposed to register the current app as platform handler for certain tag types. The example is written around this concept and doesn't start the target detection when such a registration succeeded. Unfortunately the Android implementation does something completely different. Therefore the startTargetDetection() and connect() calls after the current return is necessary to make the example useful. For now we simply ignore the feature and always start target detection. Since neither NEARD/Linux nor Android (the only two supported platforms) have an implementation for the feature the modified example works as expected. Considering the current state it should be considered to remove this NDEF message registration feature in Qt 6 altogether. The only platform which ever supported the feature was BB10 and its implementation was removed a long time ago. Task-number: QTBUG-52154 Change-Id: Ibef9e77ac33b9629b6d81aa70eaa01ab1702cfcb Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-291-1/+1
| | | | | | | | | | Change-Id: I0358b76dd2b9fb2a6224c4b9b2082a748b2d5d7a Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | Remove simulator support for NFCRainer Keller2016-04-057-776/+0
| | | | | | | | | | | | | | Support was dropped from the Emulator in 2012. Change-Id: I8cf75c368f1197a49bdc242c13408d0a2e6eda3d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-216-10/+13
|\ \ | |/ | | | | | | | | | | Conflicts: src/bluetooth/qlowenergycontroller.h Change-Id: I15571e47fbf06545d46d1b9a9b2b47bf815ae293
| * Nfc - guarantee statics initialization orderTimur Pocheptsov2016-03-181-3/+6
| | | | | | | | | | | | | | | | | | Use Q_GLOBAL_STATIC instead of simple static QMap object to avoid problems with undefined initialization order for 'statics' from different translation units. Task-number: QTBUG-51860 Change-Id: I6ce48f3c0770dc0ff125b443816f6b3b23ae809e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-155-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I375361699615d0fc874e0b96a84543e233eff5f0 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-071-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: src/bluetooth/bluetooth.pro Change-Id: Ied68947463e7eba418386a99903131d2cbdd458b
| * don't over-expose private dependenciesOswald Buddenhagen2016-02-251-3/+3
| | | | | | | | | | Change-Id: Ida2256e88c7ebe698f8b4734afc504dcef2da2d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I3cdb59c65dbbf2b536ee927dd912349b4ceca335 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Disable simulator build.Christian Kandeler2016-02-231-1/+1
| | | | | | | | | | | | | | | | | | It has obviously never been compiled with Qt 5. The code includes headers that have long been removed, uses classes that don't exist at all and so on. There is no trivial fix. Change-Id: I8fb41a50d41b061a7d7cc3c96e372f170eeb88d3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-162-0/+17
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/bluetooth/qlowenergycontroller_bluez.cpp Change-Id: I00f45a2a22a045e7836f2caeb76cc5599ced6279
| * Document QtBluetooth and QtNfc logging categoriesAlex Blasche2016-01-151-0/+14
| | | | | | | | | | Change-Id: Ib5a9f4e5c0eef85a1acd93454d842bbb0d615751 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| * Fix qdoc warning about missing dtor documentation in QQmlNdefRecordAlex Blasche2016-01-151-0/+3
| | | | | | | | | | Change-Id: Ic1f3ca5075174addfbc6d76f31d9b89d2c654d19 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Doc: fix minor typoGabriel Pannwitz2016-02-041-1/+1
| | | | | | | | | | Change-Id: I7d4546b31b966a0ac2ac82379a55eefc0f966b19 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-2085-1195/+1705
| | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I856c13e2a6d4d12c46e1286b0ca1c092ee4608f8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2016-01-051-1/+1
|\ \ | |/ | | | | Change-Id: I97b51eb3fe2040711c00da67bbb1954fc2e65c1f
| * Remove deprecated 'register' storage class specifier.Erik Verbruggen2015-12-231-1/+1
| | | | | | | | | | Change-Id: Iec9163b25f961a5f7371150aba17a892e5fac305 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-12-212-0/+6
|\ \ | |/ | | | | Change-Id: I7adae8e8a556145093e76126499e976820fcd9b2
| * Fix resource leak.Frank Meerkoetter2015-12-182-0/+6
| | | | | | | | | | | | | | | | Do not leak the private object. Fixes coverity CID21656. Change-Id: I19873364afeb4f8244c2f436129ad82d83491a2a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.6' into devAlex Blasche2015-11-112-2/+2
|\ \ | |/ | | | | Change-Id: I9303c9e168afa9bea87a63abe8774c8f2fee5f3e
| * Doc: minor link issuesNico Vertriest2015-10-301-1/+1
| | | | | | | | | | | | Change-Id: Ibd0da6662aca93d9ddd9d0a71b6ec81d983e2900 Task-number: QTBUG-43810 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix the install path with the repository name. Task-number: QTBUG-48736 Change-Id: I3452cf1ec1b1f16301497eb5468bd746d99e5cbc Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-149-0/+99
|\ \ | |/ | | | | Change-Id: Ieb4c4a3ce134e53b1387ccedae029d5a9ade92f8
| * Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-099-0/+99
| | | | | | | | | | Change-Id: I4e78a2b263fb779253556201fd20fe47a2afc58e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0.Friedemann Kleint2015-08-251-2/+2
|/ | | | | | | Fix usage of API that is marked deprecated. Change-Id: I82fe0911f6783a709356211b001e1d377f694642 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-296-4/+10
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/nfc/doc/src/nfc-index.qdoc Change-Id: Ie12d3023ff934f6579ae93617c95fc654e85a7f0
| * Port from Q_ENUMS to new macro Q_ENUMKonstantin Ritt2015-06-236-4/+10
| | | | | | | | | | | | | | | | | | | | | | Remove Q_ENUMS in favor of the new Q_ENUM macro which provides registration as meta enum and a debug stream operator. Register some enums via Q_ENUM to improve debug output and types auto-registration. Change-Id: I31c9535a2de7da1783b4ec967612c02a57cb62ff Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Remove main documentation stating Blackberry being supportedAlex Blasche2015-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | In 5.5 we don't support it anymore although other parts of the documentation and the code base still have the details. The complete removal happens in Qt 5.6. This change prepares qtconnectivity for the removal of the "Qt for Blackberry" link in the general Qt docs. Change-Id: I8d51191caf34e4b4b57b0b072f543447213eeb23 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Remove BlackBerry as supported platform from QtNfcAlex Blasche2015-06-1825-2911/+2
| | | | | | | | | | | | | | | | [ChangeLog][QtNfc][Platform Specific Changes] Removed support for Blackberry 10 from QtNfc. Change-Id: Ideca878656826de7d04dda96bd213895433a3737 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | Fix qdoc warning due to wrong parameter name used in docsAlex Blasche2015-06-161-1/+1
| | | | | | | | | | Change-Id: Icb2908106e8b869b6682b4945935cd801d67241e Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* | Update list of supported platforms in QtNfcAlex Blasche2015-06-101-1/+3
| | | | | | | | | | | | Change-Id: I6098b32fc0b28cdebd5447f59961102c655418ca Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.5' into neardAlex Blasche2015-05-113-1/+14
|\ \ | |/ | | | | Change-Id: I066a9aca0120e7002c2506959bd80a08f96f4e65
| * Revert "qndefnfcsmartposterrecord.h: Fix build with headersclean check."v5.5.0-beta1Friedemann Kleint2015-04-211-4/+0
| | | | | | | | | | | | | | | | | | | | | | Follow-up commit will fix the headers clean test properly by adding the missing assignment operator to QNdefNfcSmartPosterRecord. This reverts commit 2d4f7fd1f8d29175c8dab88a6d6cc72162511e1a. Change-Id: I9bbe381a429f695e70770ba7de33ecd704d63a86 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add assignment operator to QNdefNfcSmartPosterRecord.Friedemann Kleint2015-04-212-0/+13
| | | | | | | | | | | | | | Required to pass the headersclean test. Change-Id: I0b274ee90c4172dde99dc2f8f60525466fb8d35f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * qndefnfcsmartposterrecord.h: Fix build with headersclean check.Friedemann Kleint2015-04-201-0/+4
| | | | | | | | | | | | | | | | Skip check, required for qtbase/ 6668f5becfb8fcb6d10e42495c6ea5cdba2d15c5. Change-Id: Ie14c1f6201e60f71ce694323bf209422c7dba779 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix trailing commas in enumsAlex Blasche2015-04-201-1/+1
| | | | | | | | | | | | | | This was caused by the new headersclean enforcing warnings as errors Change-Id: Idd595fc4cf78411a80ff3dbb46477d5130a04c3e Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
* | Added documentation for NFC on AndroidPeter Rustler2015-04-133-14/+125
| | | | | | | | | | | | | | Added documentation for NFC for Android and restructured the Blackberry documentation. Change-Id: I6d3a7be11ab6f3f0edf5f6f682fa8d6642629a9c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix implementation of and improve NdefFilter usageStephan Binner2015-04-023-21/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated QML docu: describe typeNameFormat, defaults of min/max/orderMatch Removed mention of "both minimum and maximum -1 means matches any numbers": it is unimplemented and QNdefFilter::Record uses unsigned int for min/max Adapt filter logic from QNearFieldManagerPrivateVirtualBase for Android and QNX backends to add support for orderMatch, minimum and maximum properties Adapt filters and examples to use empty type as wildcard (eg Mime records) Change-Id: Id9d51514bb593bd38c3fed89b612af54dffceff0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Android Nfc: Use of StringLiteral instead of static const QStringPeter Rustler2015-03-192-47/+46
| | | | | | | | | | | | | | Qt do not like non POD types for static const data Change-Id: Id6ef07dfeb53d80a3180c9067ff7fdf14661b3f5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Use AndroidExtras for all functions in qnearfieldtarget_androidPeter Rustler2015-03-192-96/+57
| | | | | | | | | | | | | | | | Now, all code for Nfc for Android is using AndroidExtras instead JNI. Change-Id: I5fed5fd55caf23ee9c323034e909d1d13b008367 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Using QtAndroidExtras instead of Andoid JNI for NFCPeter Rustler2015-03-199-203/+78
| | | | | | | | | | | | | | | | | | Some functions in QNearfieldtarget_android are missing. They will be ported to QtAndroidExtras in a later commit. Change-Id: Ib68f91f394f28c8b19ccea4335c8f0292929f003 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
View Lorry Controller Status