diff options
| -rw-r--r-- | src/bluetooth/qbluetoothglobal.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 4 | ||||
| -rw-r--r-- | src/imports/bluetooth/qdeclarativebluetoothservice_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp | 8 | ||||
| -rw-r--r-- | tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp | 7 |
5 files changed, 9 insertions, 14 deletions
diff --git a/src/bluetooth/qbluetoothglobal.h b/src/bluetooth/qbluetoothglobal.h index dc0b5ce7..0f069ccb 100644 --- a/src/bluetooth/qbluetoothglobal.h +++ b/src/bluetooth/qbluetoothglobal.h @@ -62,7 +62,7 @@ # define Q_BLUETOOTH_EXPORT Q_DECL_IMPORT # endif # elif defined(QT_DLL) -# define Q_BLUETOOTH_EXPORT Q_DECL_EXPORT +# define Q_BLUETOOTH_EXPORT Q_DECL_IMPORT # endif #endif diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h index 4505c70f..f025c433 100644 --- a/src/bluetooth/qbluetoothsocket.h +++ b/src/bluetooth/qbluetoothsocket.h @@ -71,7 +71,7 @@ public: enum SocketType { UnknownSocketType = -1, L2capSocket, - RfcommSocket, + RfcommSocket }; enum SocketState { @@ -81,7 +81,7 @@ public: ConnectedState = QAbstractSocket::ConnectedState, BoundState = QAbstractSocket::BoundState, ClosingState = QAbstractSocket::ClosingState, - ListeningState = QAbstractSocket::ListeningState, + ListeningState = QAbstractSocket::ListeningState }; enum SocketError { diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h index bb968fd6..916c8212 100644 --- a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h +++ b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h @@ -45,7 +45,7 @@ #include <QObject> #include <qdeclarative.h> #include <qbluetoothserviceinfo.h> -#include <qdeclarativebluetoothsocket_p.h> +#include "qdeclarativebluetoothsocket_p.h" class QDeclarativeBluetoothSocket; diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 06298ecb..4b4aa0f4 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -51,8 +51,6 @@ #include <qbluetoothservicediscoveryagent.h> #include <qbluetoothlocaldevice.h> -#include <sys/utsname.h> - #include <btclient.h> QTBLUETOOTH_USE_NAMESPACE @@ -667,11 +665,7 @@ void tst_QBluetoothSocket::tst_localPeer_data() QTest::addColumn<QBluetoothAddress>("peerAddress"); QTest::addColumn<quint16>("peerPort"); - struct utsname u; - uname(&u); - - QTest::newRow("test") //<< QString::fromLocal8Bit(u.nodename) << QBluetoothAddress(BTADDRESS) << quint16(10) - << QString(BTADDRESS) << QBluetoothAddress(BTADDRESS) << quint16(10); + QTest::newRow("test") << QString(BTADDRESS) << QBluetoothAddress(BTADDRESS) << quint16(10); } void tst_QBluetoothSocket::tst_localPeer() diff --git a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp index abe1bbbd..f0f5b941 100644 --- a/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp +++ b/tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp @@ -46,9 +46,10 @@ #include <qbluetoothuuid.h> -#include <arpa/inet.h> -#include <netinet/in.h> -#ifdef Q_OS_SYMBIAN +#if defined(Q_OS_UNIX) +# include <arpa/inet.h> +# include <netinet/in.h> +#elif defined(Q_OS_SYMBIAN) //needed for symbian uuid conversion test #include <bttypes.h> #endif |