summaryrefslogtreecommitdiffstats
path: root/src/imports/nfc
Commit message (Collapse)AuthorAgeFilesLines
* Use recommended way of using \brief statements in QML Types.Alex Blasche2013-10-146-6/+6
| | | | | | Change-Id: Id8f57b69dcb80056b53bfee538a2f65c9662bb55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Update Nfc QML meta data for Qt CreatorAlex Blasche2013-10-141-25/+33
| | | | | | Change-Id: Ibb2651b948bf39e9a56a5351d5c69d5848c7a7bd Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* QtNfc QML Api starts with version 5.2Alex Blasche2013-10-147-13/+18
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Rename QDeclarativeNdefRecord -> QQmlNdefRecordSze Howe Koh2013-10-0412-42/+42
| | | | | | | | | | | 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>
* QML Near Field: Allow detecting NDEF messages without setting a filterFabian Bumberger2013-09-301-7/+5
| | | | | Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-304-26/+39
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Update QML plugin meta data for Qt CreatorAlex Blasche2013-09-261-0/+73
| | | | | | Change-Id: Ie5a9f5f0844adbd1e27753f3f6970b9431d5d741 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: Removed version from \inqmlmodule.Jerome Pasion2013-09-256-6/+6
| | | | | | | | | | -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>
* Remove LLCP from the public APIFabian Bumberger2013-09-163-7/+6
| | | | | | | 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-163-3/+0
| | | | | Change-Id: I5efbf42be944ee3dd0ba245b6ecaf752216d2b90 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-095-5/+5
| | | | | | | | 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>
* Remove workaround for improper namespace macro parsing by qdocAlex Blasche2013-06-263-12/+0
| | | | | | | Task-number: QTBUG-31851 Change-Id: I35a9ca7f83e82a41ede1a5ca6b0129248330926e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update Copyright headersAlex Blasche2013-06-2513-13/+13
| | | | | | | | | - Update Digia's copyright year - Add copyright to files without it - Convert old BSD to new LGPL license for auto test code Change-Id: I47f5c871c436f9c2731b235026434448719cc671 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Improve/Fix QtNFC documentationAlex Blasche2013-06-205-2/+14
| | | | | | | Fix qdoc warnings, snippet imports and proper documentation versioning Change-Id: Id1799ec67bf0fe6fe44c16b1ca314d8db8892bb1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update qmldir filesLiang Qi2013-05-291-0/+2
| | | | | | Change-Id: I25f81483d6fa0079f3eaf8479378444cc7598df0 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-145-5/+5
| | | | | | | | Renamed to the namespace macros to follow what syncqt expects. This fixes missing namespace macro warnings printed by syncqt. Change-Id: I7be5a700e8435a559cb4c2e74938851233095887 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* Modularise documentation.Aaron McCarthy2013-01-306-6/+6
| | | | | | | | | | Qt Bluetooth documentation had been modularised but it was still building using the old version. Use the qtbluetooth.qdocconf instead. Modularise the Qt NFC Documentation. Change-Id: Idea1631645bf21750254eddc1c41a4f819ac5156 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Further porting of NFC module from mobility to Qt 5.Aaron McCarthy2012-10-015-57/+58
| | | | | | | | | | | | | | | | | | | Includes the following changes: * Conditionally enables building of the NFC module when qmake is run with CONFIG+=nfc. * Correctly build within the QtNfc namespace. * Fix compile errors in examples, enable building of NFC examples. * Fix compile errors in tests, enable building of NFC tests. Mark the some NFC tests as insignificant as they currently crash. Notably does not enable NFC documentation generation. Task-number: QTBUG-22015 Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015 Reviewed-by: Alex <ablasche@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2313-312/+312
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4f07028d0bf0b3ba4c4649897b80687ea5e51abc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-316-6/+12
| | | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types that are implemented in C++. Change-Id: I2f739bc54785e26ce4d6c0774c10f29dee35805b Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-112-43/+1
| | | | | Change-Id: Ic1b8f0e008f55f171f940191fca009027c105d3d Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Port to the new plugin systemLars Knoll2012-06-051-1/+1
| | | | | | Change-Id: I6ea1ce1342f04befa98757a7ba6997194b56487f Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Change uses of {to,from}Ascii to {to,from}Latin1Thiago Macieira2012-05-301-1/+1
| | | | | | | | | | This operation should be a no-op anyway, since at this point in time, the fromAscii and toAscii functions simply call their fromLatin1 and toLatin1 counterparts. Task-number: QTBUG-21872 Change-Id: Ia2fed44c5db997b6fc13a243f5e312d35f8625ad Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Changed all occurrances of QML "element" to QML "type" as agreed by the docs ↵Michael Zanetti2012-03-226-17/+17
| | | | | | | team Change-Id: I812fda9282eaa6f25d0b198d6729ff99899bfe62 Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-066-18/+18
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: I40e6d40c8ca9b5e7b98a16aab3fac57ec84be63d Reviewed-by: Alex <alex.blasche@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3013-13/+13
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I84f8c423bd7748bbae495fedae696990414cee83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* added documentation and examplesMichael Zanetti2012-01-236-17/+17
| | | | | | Change-Id: Ia99e5f8f9579c189379bce1a22de3d58b12ce5fc Reviewed-by: Alex <alex.blasche@nokia.com> Sanity-Review: Alex <alex.blasche@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-2013-13/+13
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-0513-13/+13
| | | | | | Change-Id: I76920b22a5b386a0f85ec28076da20505c022b6f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* ported bluetooth and nfc declarative plugins from QtMobility to QtConnectivityMichael Zanetti2011-11-1616-0/+1872
Change-Id: I1792d516ca80418af9fc6249e4aa55964fc94b38 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>