summaryrefslogtreecommitdiffstats
path: root/examples/nfc
Commit message (Collapse)AuthorAgeFilesLines
* Fix outdated BSD license headerKai Koehne2017-10-1719-57/+247
| | | | | Change-Id: I28f5936913a6127806325df34af4bf71a142e72e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix outdated FDL license headerKai Koehne2017-10-164-20/+20
| | | | | Change-Id: Ia26b0bf499f8a0b6040e82bc1d460bee688bfbf6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-241-0/+2
| | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I2ded43d7ed46a99ba70301f07a791ed4a148c6c0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix NFC corkboard example on AndroidAlex Blasche2016-08-311-7/+32
| | | | | | | | | | | | | | The example uses a custom Manifest. The original version was based on the general AndroidManifest.xml template at the time. In the mean time the template changed (in particular the minimal SDK version was increased to version 16). THe old custom manifest required API lvl 14 which was too low. The new version is based on the current AndroidManifest.xml template which currently is Qt version 5.7.1. Change-Id: I91c04cba8c7a9979d1cff0dc070e42b98185872f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Make it more obvious what tags the NFC poster example expects.Alex Blasche2016-06-063-2/+33
| | | | | | | Task-number: QTBUG-53616 Change-Id: Ie3a87abc61100ac8fe0a5b671725f54ae28e1501 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* fix example installsOswald Buddenhagen2016-04-281-5/+6
| | | | | Change-Id: I8fb3a8f61a7007dec6935eee3bd5ff25cd756395 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* purge unreferenced .ui fileOswald Buddenhagen2016-04-281-21/+0
| | | | | Change-Id: Iacc97b5b32d6ad77e02a65c7597310116efdeeec Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix Annotated URL Example on AndroidAlex Blasche2016-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-222-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I621cb2437578c3f8a658e7c26a4de045825147ce Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-221-0/+0
| | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce Change-Id: I2b8810829f1b91033539229a6d4b3e505b8730ea Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Remove BlackBerry as supported platform from QtNfcAlex Blasche2015-06-182-33/+1
| | | | | | | | [ChangeLog][QtNfc][Platform Specific Changes] Removed support for Blackberry 10 from QtNfc. Change-Id: Ideca878656826de7d04dda96bd213895433a3737 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix implementation of and improve NdefFilter usageStephan Binner2015-04-022-2/+6
| | | | | | | | | | | | | | | 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>
* Merge remote-tracking branch 'gerrit/dev' into neardAlex Blasche2015-04-012-10/+11
|\ | | | | | | Change-Id: I3d03b2306a8e9e0e176f16475274134af973e631
| * Make the right Nfc import in qml examplesPeter Rustler2015-03-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The examples in nfc that uses qml need to import 5.5 instead of 5.2. This patch is cherry-picked from the qtconnectivity/neard branch. Change-Id: Ieb4dcfc3ec667d7a13c78a6d52d6c1a3c54f78eb Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Peter Rustler <peter.rustler@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix loading of image and show image beneath textsStephan Binner2015-03-241-10/+10
| | | | | | | | | | Change-Id: I3c623dc0db720083bc2c0c4ef53e70ccf208bfd8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix storing of image MIME recordStephan Binner2015-03-231-0/+1
| | | | | | | | | | Change-Id: I0866be315d70a6e21b587130c246e8e06a954a36 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add the feature to get the nfc intent that startet the appPeter Rustler2015-03-182-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | To support this one have to add a AndroidManifest.xml file to the project. In that file an intent filter should be added to get nfc intents while in backround.. The corkboard example was extended to have an example for this new feature. Change-Id: I108afd88f9e5a548d62245591ebef11de8eb0d81 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Make the right Nfc import in qml examplesPeter Rustler2015-03-172-2/+2
|/ | | | | | | | | The examples in nfc that uses qml need to import 5.5 instead of 5.2. Change-Id: I04d9f48e1f879227c85c2dd905382a5d1ac3a376 Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-1623-100/+100
| | | | | | | | | 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>
* Don't leave UI hanging if NdefMessage handling returned invalid requestAlex Blasche2015-01-131-0/+4
| | | | | | | | | | Invalid request implies that the platform doesn't support writing of NDEF messages. This case does not trigger an error() signal though. That's why we have to trigger the error handling code manually. Change-Id: I0b95fddfe30052f1c7baa566ebc099998854146d Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix corkboard example displayAlex Blasche2014-12-102-81/+88
| | | | | | | | | | | | | | 1.) The z order of the sticky notes and the corkboard image was totally off. Most likely this is due to a bug in QtQuick's ListView implementation. Now we have a strict parent child relationship which seems to work. 2.) The tag content was always empy. This was due to incorrect usage of QML NdefRecord API usage. Change-Id: I67e9e42e842f1cb051ef62d481b99b3c7b97718c 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-105-26/+110
| | | | | | | | | | | | | 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>
* Update image for NFC poster exampleAlex Blasche2014-09-291-0/+0
| | | | | | | Change-Id: I9dfff5fbbb8ce939de37fcf1b4f03fd7569b9203 Task-number: QTBUG-36496 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Fix reference error in NFC poster exampleAlex Blasche2014-09-161-2/+2
| | | | | | Task-number: QTBUG-37419 Change-Id: I15cedd382ee98845e51da8cd467fda1d941c1332 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Utilize QStringLiteral where possibleAlex Blasche2014-05-153-19/+19
| | | | | | | | 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>
* Doc: Improved example documentationJerome Pasion2014-04-144-13/+35
| | | | | | | | | | | | | -include a section about running the example (from qtbase/doc/global) -added links to Qt Bluetooth or Qt NFC -updated copyright year -added markup to a string and other small corrections -added \brief Task-number: QTBUG-33597 Change-Id: Ia65821549a0e2e3fbf164188982114b4741be233 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Improve NFC documentationAlex Blasche2014-03-113-9/+24
| | | | | | | | | | | | | 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>
* the poster example needs no widgets, but it needs quickOswald Buddenhagen2014-02-203-4/+7
| | | | | | | Task-number: QTBUG-36893 Change-Id: Ic77fe07aa450001386be0b2e0d4a99f2e674dbb2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Rolf Eike Beer <eb@emlix.com>
* Misc fixes for the new corkboard exampleAlex Blasche2014-02-036-13/+56
| | | | | | | | | | | | | | | | - 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>
* Add the nfc corkboard exampleFabian Bumberger2014-02-0311-0/+353
| | | | | | | | [ChangeLog][QtNfc][General] Added a new corkboard example displaying the content of NDEF text records. Change-Id: Ic60ef8a67abaf45b5f34378e822f3d89ca7e26a2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix make install rules to all examples in QtConnectivity repoAlex Blasche2013-11-283-0/+8
| | | | | | | | | This was highlighted during the testing of the Qt 5.2.0 package. Change-Id: I94b27f02a6621bccb9f0ce0d0cc184a449014573 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Doc: language and style review doc qtconnectivityNico Vertriest2013-10-142-4/+4
| | | | | | | | 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-141-1/+1
| | | | | | | | 5.0 remains silent version Change-Id: Id1665120f8e694b21b59168db5f1168a7d3ce1d6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Alter the way type and TNF are treated in the qml APIFabian Bumberger2013-09-301-2/+2
| | | | | Change-Id: Iff972e1645447a57eb72e3006318a9dd5b2d5c9b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove QtBluetooth and QtNfc namespace.Alex Blasche2013-09-095-9/+9
| | | | | | | | 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 code related to dead or currently unsupported platformsAlex Blasche2013-07-253-12/+0
| | | | | | | | | | | | | - 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>
* Fix NFC qml poster application.Alex Blasche2013-07-101-1/+1
| | | | | | | | | It was still using an old import statement from Mobility days. Change-Id: I6da2c1ba0be6e970bd6e961fcbf3eaf9ad2045a5 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Enable Qt NFC in the CI system.Alex Blasche2013-06-265-0/+11
| | | | | | | | | | | | | | | | | | 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>
* Update Copyright headersAlex Blasche2013-06-2519-19/+19
| | | | | | | | | - 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>
* Rename NFC and Bluetooth namespace macros.Aaron McCarthy2013-02-145-9/+9
| | | | | | | | 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>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-041-1/+1
| | | | | | Change-Id: I810dc7b5863c1674390a7e471845f1779cbba98c Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Further porting of NFC module from mobility to Qt 5.Aaron McCarthy2012-10-013-2/+9
| | | | | | | | | | | | | | | | | | | 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>
* Qt Bluetooth: Modularized documentationJerome Pasion2012-09-2732-0/+2397
-moved documentation to src/bluetooth/doc -added a qdocconf file for Qt Bluetooth -fixed relative paths for snippets -moved examples to examples/bluetooth Change-Id: Id41bac50dca628400568d191f1c3ccfbaac790a1 Reviewed-by: Alex <ablasche@gmail.com>