diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-20 12:05:09 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-20 13:36:35 +0200 |
| commit | 559c648e41a5a3b33127fd3a786934bff7ecf828 (patch) | |
| tree | a9adb42d330b1d11f6bba6c60951b7ee955c4de1 | |
| parent | e86b3b1c04f0abff92aeb752f3a5b8c9842d6934 (diff) | |
QNX: Fix compilation and a compiler warning
Change-Id: Id3de289238013edfc9737f444d3db95be3bd761b
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_qnx.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index ffb1deee..60736ab7 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) - : m_rdfd(-1), rdNotifier(0), error(QBluetoothServiceDiscoveryAgent::NoError), state(Inactive), deviceAddress(deviceAdapter), + : m_rdfd(-1), rdNotifier(0), error(QBluetoothServiceDiscoveryAgent::NoError), deviceAddress(deviceAdapter), state(Inactive), deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery) { ppsRegisterControl(); diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index f492d35e..5bd01730 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -350,7 +350,7 @@ void QBluetoothSocket::connectToService(const QBluetoothAddress &address, const { #ifdef QT_QNX_BLUETOOTH Q_D(QBluetoothSocket); - if (socketType() != Rfcomm) { + if (socketType() != QBluetoothServiceInfo::RfcommProtocol) { d->socketError = QBluetoothSocket::UnsupportedProtocolError; d->errorString = tr("Socket type not supported"); Q_EMIT error(d->socketError); diff --git a/src/bluetooth/qbluetoothsocket_qnx.cpp b/src/bluetooth/qbluetoothsocket_qnx.cpp index 76832524..1f3f1ed4 100644 --- a/src/bluetooth/qbluetoothsocket_qnx.cpp +++ b/src/bluetooth/qbluetoothsocket_qnx.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE QBluetoothSocketPrivate::QBluetoothSocketPrivate() : socket(-1), - socketType(QBluetoothSServiceInfo::UnknownProtocol), + socketType(QBluetoothServiceInfo::UnknownProtocol), state(QBluetoothSocket::UnconnectedState), readNotifier(0), connectWriteNotifier(0), |