summaryrefslogtreecommitdiffstats
path: root/src/nfc
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * QNX: Config test for libbb2Fabian Bumberger2014-02-141-11/+32
| | | | | | | | | | | | | | | | | | | | | | libbb2 is not available in a public NDK yet. In order to be able to compile NFC for BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only built if libbb2 is detected. Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
| * Fix qmake and compiler warningsAlex Blasche2014-02-142-3/+2
| | | | | | | | | | | | | | | | | | Public headers should not include local header files (qmake warning) and fix warning about unused parameter. Change-Id: Id12d2255f6011507649b25ed2bc74356e0f4538e Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * Add support for NFC file and data sharingStuart Burge2014-02-1317-8/+1778
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide ability to allow NFC enabled devices to exchange file and data content using a high-level API. [ChangeLog][QtNfc][General] A new NFC share API was added. The API provides sharing of NDEF messages and arbitrary files via NFC and may potentially use other communication protocols such as wifi or Bluetooth as part of its implementation. Change-Id: I878df1702ce4164384096d00e53dcd354d1bfafc Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Merge "Merge remote-tracking branch 'gerrit/stable' into dev" into ↵Alex Blasche2014-02-061-0/+1
| |\ | | | | | | | | | refs/staging/dev
| | * Merge remote-tracking branch 'gerrit/stable' into devAlex Blasche2014-02-031-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothservicediscoveryagent.cpp Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
| | | * Add missing documentation for QQmlNdefRecord::Unknown enum value.Alex Blasche2014-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida3f7816340f9379629e653abc5ef89f5aa38486 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * | | Normalize signal & slot signatures in connectionThiago Macieira2014-02-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: I50c4f66f30debd49c37109dd2460925dc22af605 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
| * | | Misc fixes for the new corkboard exampleAlex Blasche2014-02-032-0/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The example was hooked into the build system. - The display location of notes on the display was optimized to reduce overlapping with the bottom and right corner. - A documentation page was added for the example. - example binary added to git ignore list - Fix license headers Change-Id: Ib18433c2a7dd68a3573c62ff3215fa0e69954f95 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * / whitespace fixesOswald Buddenhagen2014-01-203-3/+3
| |/ | | | | | | | | | | | | remove trailing whitespace, expand tab Change-Id: I3361c6c431231c7463bb1dc9b53268935b22a72b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Fix remaining compiler warnings in QtConnectivity moduleFabian Bumberger2014-01-071-1/+1
| | | | | | | | | | Change-Id: Iafadb39642c6b2944e8a873bdee49fb87e3ed5e9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I8ee21679bc4990bb8c81d8e4a7233d7ec2824ba7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * Build Bluetooth and NFC only for BlackberryAndreas Holzammer2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | Plain QNX does not need to have Bluetooth and/or NFC. Change-Id: I6323d03292a2b72d21f8d947bb58205648cb0061 Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * use private linkage where possibleOswald Buddenhagen2013-10-311-1/+1
| | | | | | | | | | Change-Id: I14e289bd44ab31fff081d5d63974e524232313a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | 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>
* Doc: Fix module name formatv5.2.0-beta1Sze Howe Koh2013-10-212-2/+2
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Task-number: QTBUG-33360 Change-Id: I51f23e4b3ac0dffe8fef674f2cb431776d5829ab Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: language and style review doc qtconnectivityNico Vertriest2013-10-145-11/+11
| | | | | | | | Reviewed doc Bluetooth and NFC Task-number: QTBUG-32173 Change-Id: I80f81c2123c3ee4fc269f471123f332dc39ee958 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-142-2/+2
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Fix unit test error in qndefrecord.Alex Blasche2013-10-112-14/+12
| | | | | | | | | | | The typenameformat signal was not always emitted due to insufficient logic associated with first time initialization of QQmlNdefRecord. This error only happened when the compiler didn't initialize QNdefRecordPrivate::typeNameFormat to 0. Change-Id: Ieba0a1d7c940c40980ff455ca5c1665c298c0527 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove the "registerNdefMessageHandler" template function and doc fixesAlex Blasche2013-10-112-12/+1
| | | | | | | | Too much syntactic sugar and qdoc has problems recognising it as well. Change-Id: I99f482426f537a8d3c0099edc3c393676424afec Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Rename QDeclarativeNdefRecord -> QQmlNdefRecordSze Howe Koh2013-10-045-63/+63
| | | | | | | | | | | The QDeclarative* class prefix is associated with the now-deprecated Qt Declarative module (a.k.a. Qt Quick 1). In Qt Quick 2, all QDeclarative* classes have been renamed to QQml* or QQuick* Also rename the example, QDeclarativeNdefFooRecord -> QQmlNdefFooRecord Change-Id: Ie81a9ea2fdda145ad749afb07ef758f791b278d0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-302-32/+107
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Extend documentation for NDEF message handlersv5.2.0-alpha1Fabian Bumberger2013-09-251-0/+15
| | | | | Change-Id: If96b4fc9aacc3c16e9e8eb88ab4849ec15e280b5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QNX: Set the correct target id for the invoke filterFabian Bumberger2013-09-251-2/+7
| | | | | Change-Id: I328703f2578ffef10e9b475d0015a30ec6671b5b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Removed version from \inqmlmodule.Jerome Pasion2013-09-251-1/+1
| | | | | | | | | | -QDoc ignores the version in \inqmlmodule but it is good to remove it to avoid confusion. -QDoc uses \qmlmodule for the import statement Task-number: QTBUG-32172 Change-Id: If5a3ec8a16aabcf5abec6d1794717ea2c54f0c9f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Changing the way nfc target detection worksFabian Bumberger2013-09-1915-70/+33
| | | | | | | | | On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use. This patch removes the parameters used for target detection. Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Lower the verbosity of bluetoothFabian Bumberger2013-09-181-1/+1
| | | | | | | | | Remove some qDebug statements and change qDebugs to qWarning in case of an error. Task-number: QTBUG-32253 Change-Id: Ia647d3f485cae56cc9f9c6725400f5b4617b7bf7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove LLCP from the public APIFabian Bumberger2013-09-1613-123/+147
| | | | | | | QLLCPServer does not work properly yet on BlackBerry so I would want to wait committing to this API till we have a backend that is working properly. Change-Id: I62cbe9dae00ed47377086e4c8522298b4c9fa5a4 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix qdoc warningsAlex Blasche2013-09-161-7/+5
| | | | | Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove transactionDetected signalFabian Bumberger2013-09-112-12/+0
| | | | | | | Not used anywhere. Change-Id: I1b310addd84b3ab4308c33f296bc71e762d7d7e8 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-0971-155/+147
| | | | | | | | This is based on namespace discussions on the Qt project dev mailing list. We continue to use the Qt namespace. Change-Id: I6119d06662f7682c11f42d759f3218be1f5a7d6c Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Move qNfcChecksum() definition into a .cpp fileSze Howe Koh2013-09-094-72/+24
| | | | | | | | | | | The function is public; doesn't make sense to implement it in a private header. This patch also resolves the multiply-defined-symbols issue when trying to build some Qt NFC autotests without the "QtNfc" namespace. Change-Id: I4ba1dc31d93bb66454c7dcd043c18f81dc2ad680 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Add copy constructor to QNdefNfcSmartPosterRecord to avoid compile errorAlex Blasche2013-08-132-0/+9
| | | | | | Change-Id: I133e7f09780d8da3bb88e9971a7f858b905176b4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Setting \qtvariable in module page.Jerome Pasion2013-08-021-0/+1
| | | | | | | \qtvariable indicates the QT variable needed in .pro files. Change-Id: I13d0a179dbea663a85fe9b175bf6770fe673d732 Reviewed-by: Martin Smith <martin.smith@digia.com>
* QNX: Fix compiler warningsFabian Bumberger2013-07-313-4/+7
| | | | | Change-Id: Ia73b3a89464d5913bec4cc528047283475297083 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove code related to dead or currently unsupported platformsAlex Blasche2013-07-2532-4215/+8
| | | | | | | | | | | | | - Removes the Meego/Maemo backend for QtNfc - Remove Simulator, WinCE and S60 remnants from the examples If any of these platforms becomes relevant they can be added back of course. Change-Id: I84712ea07f01794b622560ce77e08cee347406e3 Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Alex <alexander.blasche@digia.com>
* Don't export QNearFieldTagType* classes.Alex Blasche2013-07-2514-21/+69
| | | | | | | | | | | | There is no implementation for them at this stage. Hence we remove them from the committed API. They remain enabled via auto tests to ensure that the code keeps working. Task-number: QTBUG-32306 Change-Id: I5312e8436a99be4e24311bea4c92718239178ef4 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Michael Zanetti <michael.zanetti@canonical.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Add support for NFC smart posterStuart Burge2013-07-101-1/+1
| | | | | | | | | Fix copy-paste error in icon list Task-number: QTBUG-31738 Change-Id: I525f8023e0a1b5d106d93bde0a4b3e950a2ba6ce Reviewed-by: Alex <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Add unit test and signal for/to QDeclarativeNdefRecordAlex Blasche2013-07-102-1/+20
| | | | | Change-Id: Ifbfb2e11b072610b3f2c140a469ed73e110c2eca Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fixing QNearFieldTarget::waitForRequestCompletedFabian Bumberger2013-07-103-25/+14
| | | | | | | | | | | | The current implementation is not waiting at all. Adjust the waiting time for the tagtype1 unit test to avoid 30min runtime. Change-Id: Ied9cff72456b964af9224362f47113a7e2c792ae Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Add support for NFC smart posterStuart Burge2013-07-028-5/+1004
| | | | | | | | | | Provide ability to construct a smart poster record from an NDEF record and get/set smart poster specific values. The record can be used as part of an NDEF message for transmission via NFC or writing to a tag Task-number: QTBUG-31738 Change-Id: I2f7ff287d7c732a3fb3ec7c5c6a7b8f50f13ab1d Reviewed-by: Alex <alexander.blasche@digia.com>
* QNX: Fix compilation with new NDKFabian Bumberger2013-07-023-3/+3
| | | | | | | Change-Id: I92aab2e183f676d09092fa4d387bdf1e28a66289 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Fix QNearFieldTarget::AccessMethods flags to permit OR concatenationAlex Blasche2013-06-272-3/+5
| | | | | | | | | | | Adds an UnknownAccess enum value for tag types not yet known by the library/backend. Task-number: QTBUG-26027 Change-Id: Ic7654c0906b22bbd5c71bafd3e90a924bf913e23 Reviewed-by: Stuart Burge <sburge@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix test error in qnearfieldtagtype2 auto test due to race condition.Alex Blasche2013-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | This assumes the use of the nfc emulator. The block selector call in tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp line 221 fails as the execution of the sector selection requires multiple event loop turns. First it must loop to execute the second "SECTOR SELECT" packet (Command Packet 2). This will set NfcTagType2::currentSector to the new sector. The same packet will trigger a timer event in QNearFieldTagType2::handleResponse. During the second event loop run the above timer event will set QNearFieldTagType2::d->m_currentSector to the new sector. This will set the request ID for the sector select request to processed/finished. While the above two events have to happen the tst starts waiting for the completion of the sector selection request. The waiting period is merely 1 ms which is too short for the timer event to execute. Subsequently the test returns with an incomplete sector select request. Change-Id: I980e440b3431d2fb828e1753f5ef8ea622dd6d3a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Export qHash(QNdefRecord)Alex Blasche2013-06-271-1/+1
| | | | | | | | | | | | | The symbol is used by the library itself. We may as well export it for wider use. The patch adds qHash usage to the unit tests to confirm the export of the function and to ensure catch changes of the hashing algorithm. Task-number: QTBUG-31951 Change-Id: Ic6e6e2a0cf7ee5aa9f5bd6c91a8a6c31030c5848 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove workaround for improper namespace macro parsing by qdocAlex Blasche2013-06-265-20/+0
| | | | | | | Task-number: QTBUG-31851 Change-Id: I35a9ca7f83e82a41ede1a5ca6b0129248330926e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix links to general qtdoc related pages for NFC and BluetoothAlex Blasche2013-06-262-1/+6
| | | | | | | Task-number: QTBUG-31913 Change-Id: Icdfb5a98cae840b1e5de5690d9081e9b986f615a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Enable Qt NFC in the CI system.Alex Blasche2013-06-263-5/+9
| | | | | | | | | | | | | | | | | | Don't require CONFIG+=nfc to build QtNfc lib. This prevents proper test execution and there is no API commitment until the API is offcially released anyway. Excludes three auto tests from -developer-build builds as they require Q_AUTOTEST_EXPORT. Fixes compile errors associated to namespace'd builds of Qt. Revert "Remove not needed symbol 'qHash(const QNdefRecord&)'" The symbol is needed during compilation by Windows. This reverts commit 39901af48f40f0672731a1f62dc003c4b37d1fec. Change-Id: I61c644bbfc4906729e6d2b9deb741989030c8624 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove not needed symbol 'qHash(const QNdefRecord&)'Alex Blasche2013-06-252-9/+0
| | | | | | | Task-number: QTBUG-31951 Change-Id: If3d8c9dd5a848c2b0b60b533921a4933a63c4c92 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* Fix parsing of QNdefMessage::fromByteArray()Alex Blasche2013-06-251-1/+3
| | | | | | | | | | | | Multiple NdefRecords were parsed incorrectly because the to-be-added record was never reset when reading the next entry. The added unit test fails without the fix. Task-number: QTBUG-31950 Change-Id: I2f1335b7e2d43000f55dc429524c5b8b87f868d2 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 09:19:08 +0000