diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-29 16:25:53 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-30 03:37:49 +0100 |
commit | d9cab185a8345b336c46c528daab362670a7632c (patch) | |
tree | d16328ae39d9aad5795ac61a599e75f231466dd5 /tests | |
parent | 2ac280238af04068fce7df38156b5ba312dc2a64 (diff) |
QtConnectivity: Fix compilation on Windows.
- Fix imports
- Fix includes
- Remove trailing comma from enumerations (error in clang)
Change-Id: I9627fe613e59accffc788def9e44a068ed02109f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp | 8 | ||||
-rw-r--r-- | tests/auto/qbluetoothuuid/tst_qbluetoothuuid.cpp | 7 |
2 files changed, 5 insertions, 10 deletions
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 |