diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-06 14:38:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-07 03:29:49 +0200 |
| commit | 5aa9874f51760a47700933fc833d4b94448b6ed5 (patch) | |
| tree | 77f03cb364da2a13aa27d5494a858f67e34c2cce /src/bluetooth | |
| parent | 6a36e6e292cc13d559693686cfd2394894bcd1fa (diff) | |
QtConnectivity: Fix compile on Windows.
Change-Id: I7b8bd2c120c9905a581eee66146378b9373d1cb2
Reviewed-on: http://codereview.qt-project.org/6157
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Zanetti <mzanetti@kde.org>
Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.h | 4 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h index d013cc8b..e7f18108 100644 --- a/src/bluetooth/qbluetoothlocaldevice.h +++ b/src/bluetooth/qbluetoothlocaldevice.h @@ -58,11 +58,11 @@ class QBluetoothLocalDevicePrivate; class Q_BLUETOOTH_EXPORT QBluetoothHostInfo { public: - QBluetoothHostInfo() { }; + QBluetoothHostInfo() { } QBluetoothHostInfo(const QBluetoothHostInfo &other) { m_address = other.m_address; m_name = other.m_name; - }; + } QBluetoothAddress getAddress() const { return m_address; } void setAddress(const QBluetoothAddress &address) { m_address = address; } diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 6968e212..40c94850 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -66,7 +66,7 @@ QT_BEGIN_HEADER class QBluetoothAddress; -#ifdef QT_BLUEZ_BLUETOOTH +#if defined(QT_BLUEZ_BLUETOOTH) class QBluetoothLocalDevicePrivate : public QObject, protected QDBusContext { @@ -104,9 +104,9 @@ private: QBluetoothLocalDevice *q_ptr; }; -#endif -#ifdef QT_SYMBIAN_BLUETOOTH +#elif defined(QT_SYMBIAN_BLUETOOTH) + class QBluetoothLocalDevicePrivate : public MBTEngSettingsObserver { @@ -144,6 +144,10 @@ protected: QBluetoothLocalDevice *q_ptr; }; +#else +class QBluetoothLocalDevicePrivate : public QObject +{ +}; #endif QT_END_HEADER |