diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-06-27 19:04:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-02 08:59:32 +0200 |
| commit | 1dce1dd4dda63d7b309710114f5d1eea69a52449 (patch) | |
| tree | b6a7b94d7d6ab4c471e75f9633521ca0942aa085 /src/nfc | |
| parent | fc74651938b0a934a51a3b454f0ff08ec1c0a92f (diff) | |
QNX: Fix compilation with new NDK
Change-Id: I92aab2e183f676d09092fa4d387bdf1e28a66289
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qllcpserver_qnx_p.cpp | 2 | ||||
| -rw-r--r-- | src/nfc/qllcpsocket_qnx_p.cpp | 2 | ||||
| -rw-r--r-- | src/nfc/qnx/qnxnfcmanager_p.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/nfc/qllcpserver_qnx_p.cpp b/src/nfc/qllcpserver_qnx_p.cpp index 1bc4fb3e..849fba7f 100644 --- a/src/nfc/qllcpserver_qnx_p.cpp +++ b/src/nfc/qllcpserver_qnx_p.cpp @@ -55,7 +55,7 @@ bool QLlcpServerPrivate::listen(const QString &serviceUri) if (isListening()) return false; - nfc_result_t result = nfc_llcp_register_connection_listener(SERVER, 0, serviceUri.toStdString().c_str(), &m_conListener); + nfc_result_t result = nfc_llcp_register_connection_listener(NFC_LLCP_SERVER, 0, serviceUri.toStdString().c_str(), &m_conListener); m_connected = true; if (result == NFC_RESULT_SUCCESS) { m_serviceUri = serviceUri; diff --git a/src/nfc/qllcpsocket_qnx_p.cpp b/src/nfc/qllcpsocket_qnx_p.cpp index 5bd98ea5..beecfa17 100644 --- a/src/nfc/qllcpsocket_qnx_p.cpp +++ b/src/nfc/qllcpsocket_qnx_p.cpp @@ -63,7 +63,7 @@ void QLlcpSocketPrivate::connectToService(QNearFieldTarget *target, const QStrin } m_state = QLlcpSocket::ConnectingState; - if (nfc_llcp_register_connection_listener(CLIENT, 0, serviceUri.toLocal8Bit().constData(), + if (nfc_llcp_register_connection_listener(NFC_LLCP_CLIENT, 0, serviceUri.toLocal8Bit().constData(), &m_conListener) != NFC_RESULT_SUCCESS) { qWarning() << Q_FUNC_INFO << "could not register for connection listener"; return; diff --git a/src/nfc/qnx/qnxnfcmanager_p.h b/src/nfc/qnx/qnxnfcmanager_p.h index 31f9ed2f..d3d0ec22 100644 --- a/src/nfc/qnx/qnxnfcmanager_p.h +++ b/src/nfc/qnx/qnxnfcmanager_p.h @@ -94,7 +94,7 @@ private: QList<QPair<nfc_llcp_connection_listener_t, QObject *> > llcpConnections; QList<QPair<unsigned int ,QObject*> > nfcTargets; - QHash<QObject *, QList<QByteArray>> ndefFilters; + QHash<QObject *, QList<QByteArray> > ndefFilters; QList<QByteArray> absNdefFilters; //QList<QPair<QObject*, QMetaMethod> > ndefMessageHandlers; |