summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdeviceinfo.h Change-Id: I2ad566b9ca8fb001fa91a74501e83e8a2121ef3a
| | * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I01f01575a03d95f558b1f1994e0c76b22b3c19e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | * Use single-char QString operations for efficiencySergio Ahumada2015-02-111-2/+2
| | | | | | | | | | | | | | | Change-Id: Ifdb98e21999ecdcf57c89a3664b8d0db796c73a1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Update copyright headersJani Heikkinen2015-02-16113-749/+701
|/ / | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I3822a6484e8f7a420330de1cb1aeb0c3d1cf41b7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()Alex Blasche2015-01-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is much safer and cleaner. [ChangeLog][QtBluetooth][Important Behavior Changes] Q_DECLARE_METATYPE added for QBluetoothServiceDiscoveryAgent::Error, QBluetoothSocket::SocketState, QBluetoothSocket::SocketError and QBluetoothDeviceInfo. This breaks source compatibility if application code has defined the above metatypes already. The applications Q_DECLARE_METATYPE must be removed to fix the compile error. Change-Id: I1c7cb1ee25832b7e5337c9aca6f36b21e8caf22e Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Disable writing of Ndef messages due to crash in Neard daemonAlex Blasche2015-01-131-0/+5
| | | | | | | | | | | | | | Task-number: QTBUG-43802 Change-Id: I8500f67e44ad4119ec540eb45c1891ac849d2085 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Neard: fix tag writingMartin Leutelt2015-01-131-38/+59
| | | | | | | | | | | | | | | | The write operation has to be delayed since neard isn't able to write to tags immediately after tag detection. Change-Id: I177cc700d0688e23909b9b2751a0d11f163a5499 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Improve some parts of the SmartPoster API docsAlex Blasche2014-12-112-5/+26
| | | | | | | | | | | | Change-Id: I09f087d84641447fcb5e9e906f3d665ed86102e3 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Neard: Read all availabe SmartPoster dataAlex Blasche2014-12-111-7/+20
| | | | | | | | | | | | | | | | | | So far, Size, Action and MimeType were not read when detecting a smartposter tag. Change-Id: Ica283eac8248ef5ed73f8538eac76050b1310eef Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix writing of NFC URI recordsAlex Blasche2014-12-111-2/+2
| | | | | | | | | | | | | | | | | | We need to write the entire URL and not just the path which would be empty in cases such as http://www.qt.io. Change-Id: I3529e200088cc9192fa16626cb21fffcca7f26c5 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Enable automatic tag polling if message handler is not supported.Alex Blasche2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | All examples have used message handler registration so far. That's not always supported on all platforms. Neard is one of those platforms against which this this was verified. This patch converts some examples to use manual target detection if handler registration fails. Change-Id: Icfd8b7c695e63351a45b867fd69e9fc5fefb9360 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge branch 'dev' into neardAlex Blasche2014-11-2586-1571/+1215
|\| | | | | | | Change-Id: I700bda01e7bb96331458fd98d1940cbd44f4eb78
| * Doc: Applied title case to section1 titlesNico Vertriest2014-10-092-3/+3
| | | | | | | | | | | | | | Change-Id: I4bf466a3f6c34b338f741ec003343b572e73d738 Task-number: QTBUG-41250 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Add \since tag to NFC classes which didn't have the tag yetAlex Blasche2014-09-269-0/+9
| | | | | | | | | | | | | | | | Internal or not yet released classes have been skipped Change-Id: I5bc3e08f87348ae8df61b923d7cdb81186ebebc8 Task-number: QTBUG-36775 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-2828-1/+308
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
| | * Add missing private headers warningSamuel Gaist2014-08-1828-1/+308
| | | | | | | | | | | | | | | Change-Id: I0f079a9b1b45bd2d2e946e06d7688f299a9c3fc3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Update license headers and add new licensesJani Heikkinen2014-08-2484-1566/+894
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | Merge remote-tracking branch 'gerrit/5.4' into btleAlex Blasche2014-08-131-1/+0
| |\ \ | | | | | | | | | | | | Change-Id: I1e79c96602d0da2c2d36d6217bdfe7ff183e6df9
| | * | Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: Iff25abdbdbddd862cfc24d31aa12e103955bb5d2 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * | | Merge branch 'dev' into btleAlex Blasche2014-05-2617-35/+42
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/bluez/bluez.pri src/bluetooth/doc/src/bluetooth-index.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothdeviceinfo.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: I88b22c51a4ee95b067ef8d2b2fddb5cbff4566f8
| * | | Merge branch 'dev' into btleAlex Blasche2014-03-1413-70/+169
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothuuid.cpp tests/bttestui/btlocaldevice.cpp Change-Id: Id16ab93ec61361950669da7eb232769c5dc4644f
| * \ \ \ Merge branch 'dev' into btleAlex Blasche2014-02-1726-19/+1814
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/bluetooth/bluetooth.pro src/bluetooth/doc/src/examples.qdoc src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp src/bluetooth/qbluetoothservicediscoveryagent_p.h src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
| * | | | | Implemented Bluetooth Low Energy gatt service and characteristics discoveryNedim Hadzic2013-11-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluez v4.x does not have total support for LE devices, a new approach, using gatttool command was implemented. Auto-tests and documentation will be in other commits. Change-Id: Iee711cc111199e15956052eebb7593bd3a5e27c8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Update documentation to reflect new Linux platform supportAlex Blasche2014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a few qdoc errors along the way. Change-Id: Ia0caf483f5c86dbd5c47f3d96a6d5bcf622db312 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | | | | Updated documentation to include neardMartin Leutelt2014-10-161-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5fbcc7975f9d01374ac296d6a5528974e8513601 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Fixing crash when stopping poll loopLutz Schönemann2014-10-092-30/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When stopping the neard adapter poll loop without starting it from the same QNearFieldManagerPrivateImpl instance the m_adapter variable does not hold a valid pointer to an instance of OrgNeardAdapterInterface. This patch fixes that issue by creating a temporary instance on the stack to call the appropriate function on the D-Bus interface. Change-Id: I42ced8d00ca9f87756c8f3f81ca78969702344c1 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | QNearFieldManager::registerNdefMessageHandler returns -1 on errorAlex Blasche2014-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings it in line with another function overload. Change-Id: I9120f755790e60b5073024133955c2b10671308f Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Neard: porting to neard v0.14Martin Leutelt2014-09-3028-447/+948
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dbus interfaces have been adapted to the state of neard v0.14. Reading from the supported tags works, writing to them works to a limited extent. Change-Id: Ib0704c6d951baa31ad58484e0c11534aaad359be Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Neard: Implement tag writeFabian Bumberger2014-07-081-3/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I423658f5365ed51ccb117f5e388b93cc3ab2b8f9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Add neard ndef record parsingFabian Bumberger2014-07-025-10/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the neard dbus interface and provides logic to parse data from this interface. Change-Id: Id9a5df88d75c71cf6f2b320afed644a38d03c38d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Implement tag detected and tag lost signalsFabian Bumberger2014-07-023-15/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch also implements reading the record pathes from the tag. Change-Id: Ia19ff235149cb91d3cbf7ae7c043d07d6aeae429 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Introduce a logging category for the neard implementationFabian Bumberger2014-07-024-10/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3bee8a5c2e3bee9a83ddcb6f3a5b2b42fdb24d89 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Clean up neard implementationFabian Bumberger2014-07-024-32/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides some code cleanups this patch makes sure to only build the neard implementation if dbus is available. This patch also deals with the possibility that the neard daemon is not running on the system. Change-Id: I8546d34b808d8236e0434e00cf5950b31e20cb72 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Add QNearfieldTarget neard implementationFabian Bumberger2014-07-023-1/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly a skeleton implementation. There is no support yet for reading records or ndef messages. Change-Id: Id521468517c04b088152e15a327cff9b26fa346f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Initial implementation of the QNearfieldmanagerFabian Bumberger2014-07-025-4/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the QNearFielManager is not functional yet, this commit contains a sceleton implementation on which the future implementation can be built on. Change-Id: I075b42bb74051db4629e7a93b2aaea89785807b9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Add neard Tag dbus interfaceFabian Bumberger2014-07-024-2/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id4152a5c6d622d8a0195d30d28b9ac8714491b92 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Add C++ Dbus neard interfacesFabian Bumberger2014-07-015-0/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice6343bf486f4a908704de14772e8d4464106f4a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | | Add Neard dbus xml interfacesFabian Bumberger2014-07-012-0/+65
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Change-Id: Ie3661fe2b35735e22613e1c7ce0a408652b69970 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | Utilize QStringLiteral where possibleAlex Blasche2014-05-153-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only exception are generated files and cases where QLatin1String based overloads are used (e.g. during QString comparisons) Change-Id: I6f36789fb8acb3b30c1dc1f8a920b118a979d74f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | | | | Replace Q_SIGNALS/Q_SLOTS with signals/slots in private headersOleg Shparber2014-04-299-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes private headers accordingly to coding guidelines Change-Id: Id428e162207a7ae70ccfbcb172d28cab79739818 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | | Replace all occurrences of Q_EMIT with emitOleg Shparber2014-04-293-8/+8
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Ieec72048837abe70b0187086b265bcde96c7d6cd Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | | Equalize the docs front page layout with qtlocation and qtsensors.Alex Blasche2014-04-021-1/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: Iedd783ff59a62ca21e61502999dd450392f48644 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Replace double quote with single quote for single charactersSergio Ahumada2014-03-292-3/+3
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Adding single characters to a QString is faster if the characters are QChars and not QStrings. Change-Id: I31a9e24b31bad76726231c8d164584abddde6c28 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Fix code snippet error in docs and point out supported NFC platformsAlex Blasche2014-03-113-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippet was shifted into a compiled project to ensure continued compilation. Task-number: QTBUG-34978 Change-Id: I93f3b39442992bfb4049a44ed0dd6330d3ca9270 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | | Improve NFC documentationAlex Blasche2014-03-118-61/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.) Extend the NFC overview page 2.) Ensure that snippets are compiled at all times 3.) Mark Qt 5.3 APIs using \since Task-number: QTBUG-32401 Task-number: QTBUG-34978 Change-Id: I8928be3d7dd2c9de1314eb1ec6ed55c8d4301f4a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 09:35:37 +0000