summaryrefslogtreecommitdiffstats
path: root/src/imports/nfc
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2013-09-10 16:56:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-16 09:36:21 +0200
commit2c5400e0080e7574d048c10e12b308bb1fbade56 (patch)
tree7baad2f6ca0cb16f3a06fc851bd2b07763da5dac /src/imports/nfc
parente31271a184fe06da8be6cd745a55a6950466d425 (diff)
Remove LLCP from the public API
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>
Diffstat (limited to 'src/imports/nfc')
-rw-r--r--src/imports/nfc/nfc.pro4
-rw-r--r--src/imports/nfc/plugin.cpp4
-rw-r--r--src/imports/nfc/qdeclarativenearfieldsocket.cpp5
3 files changed, 6 insertions, 7 deletions
diff --git a/src/imports/nfc/nfc.pro b/src/imports/nfc/nfc.pro
index bed94d5f..a020f09b 100644
--- a/src/imports/nfc/nfc.pro
+++ b/src/imports/nfc/nfc.pro
@@ -2,7 +2,7 @@ QT = core qml nfc
# Input
HEADERS += \
- qdeclarativenearfieldsocket_p.h \
+ #qdeclarativenearfieldsocket_p.h \
qdeclarativenearfield_p.h \
qdeclarativendeffilter_p.h \
qdeclarativendeftextrecord_p.h \
@@ -10,7 +10,7 @@ HEADERS += \
qdeclarativendefmimerecord_p.h
SOURCES += plugin.cpp \
- qdeclarativenearfieldsocket.cpp \
+ #qdeclarativenearfieldsocket.cpp \
qdeclarativenearfield.cpp \
qdeclarativendeffilter.cpp \
qdeclarativendeftextrecord.cpp \
diff --git a/src/imports/nfc/plugin.cpp b/src/imports/nfc/plugin.cpp
index ba254768..dd97e296 100644
--- a/src/imports/nfc/plugin.cpp
+++ b/src/imports/nfc/plugin.cpp
@@ -43,7 +43,7 @@
#include <QtQml/QQmlExtensionPlugin>
#include "qdeclarativendefrecord.h"
-#include "qdeclarativenearfieldsocket_p.h"
+//#include "qdeclarativenearfieldsocket_p.h"
#include "qdeclarativenearfield_p.h"
#include "qdeclarativendeffilter_p.h"
#include "qdeclarativendeftextrecord_p.h"
@@ -67,7 +67,7 @@ public:
int major = 5;
int minor = 0;
- qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket");
+ //qmlRegisterType<QDeclarativeNearFieldSocket>(uri, major, minor, "NearFieldSocket");
qmlRegisterType<QDeclarativeNearField>(uri, major, minor, "NearField");
qmlRegisterType<QDeclarativeNdefFilter>(uri, major, minor, "NdefFilter");
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket.cpp b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
index 70b29415..15e59f9b 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket.cpp
+++ b/src/imports/nfc/qdeclarativenearfieldsocket.cpp
@@ -51,13 +51,12 @@
\ingroup nfc-qml
\inqmlmodule QtNfc 5.0
- \sa QLlcpSocket
- \sa QLlcpServer
-
The NearFieldSocket type was introduced in \b {QtNfc 5.0}.
The NearFieldSocket type can be used to create a peer-to-peer connection over NFC LLCP
sockets. NearfieldSocket can be used for both client and server side sockets.
+
+ \internal
*/
/*!