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 /src/bluetooth | |
| 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 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothglobal.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.h | 4 |
2 files changed, 3 insertions, 3 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 { |