diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-16 10:48:15 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-06-18 08:03:37 +0000 |
| commit | 3e5a32e9a40916e0bae882ba22b9d2b1131d6326 (patch) | |
| tree | 565842aa1aa123cdf1589ca99f6862f2a9d7bcf5 /src/nfc/doc | |
| parent | 9f77e292036b5eaffa353f7a783416be6b8f9902 (diff) | |
Remove BlackBerry as supported platform from QtNfc
[ChangeLog][QtNfc][Platform Specific Changes] Removed
support for Blackberry 10 from QtNfc.
Change-Id: Ideca878656826de7d04dda96bd213895433a3737
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/nfc/doc')
| -rw-r--r-- | src/nfc/doc/src/nfc-blackberry.qdoc | 52 | ||||
| -rw-r--r-- | src/nfc/doc/src/nfc-index.qdoc | 3 |
2 files changed, 1 insertions, 54 deletions
diff --git a/src/nfc/doc/src/nfc-blackberry.qdoc b/src/nfc/doc/src/nfc-blackberry.qdoc deleted file mode 100644 index feebceb8..00000000 --- a/src/nfc/doc/src/nfc-blackberry.qdoc +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\ingroup connectivity-nfc -\inmodule QtNfc -\since 5.6 -\page nfc-blackberry.html -\title Qt NFC on Blackberry -\brief Notes on Nfc for Blackberry. - -\section1 Automatically launching NDEF message handlers on Blackberry -On BlackBerry the registration for NDEF message handlers is done over the -\l{https://developer.blackberry.com/native/documentation/core/invocation_framework.html}{Invocation Framework}. -This means that the application has to set an invoke target in the bar descriptor xml file when using -\l registerNdefMessageHandler(). - -\code -<invoke-target id="com.myapp.id"> - <type>APPLICATION</type> - <filter> - <action>bb.action.OPEN</action> - <mime-type>application/vnd.rim.nfc.ndef</mime-type> - </filter> -</invoke-target> -\endcode -*/ - diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc index b295f7ec..da8833d8 100644 --- a/src/nfc/doc/src/nfc-index.qdoc +++ b/src/nfc/doc/src/nfc-index.qdoc @@ -35,8 +35,7 @@ The NFC API provides connectivity between NFC enabled devices. Currently the API is supported on \l{Qt for Android}{Android}, -\l{Qt for BlackBerry}{BlackBerry 10} and \l{Qt for Linux/X11}{Linux} using -\l {https://01.org/linux-nfc}{Neard} v0.14 or later. +and \l{Qt for Linux/X11}{Linux} using \l {https://01.org/linux-nfc}{Neard} v0.14 or later. \section1 Overview |