diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-11-13 15:39:26 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2014-11-13 15:39:26 +0100 |
| commit | a3c295297a4ee1365619cc49f504a9f35b4f7785 (patch) | |
| tree | a40a5ef9b0664ea4e27dc1c27116f8f7efcb364f /src/bluetooth/qbluetoothlocaldevice_p.h | |
| parent | 020e9115392a31b55c7340dbb9c8cfac8a528b35 (diff) | |
| parent | 720137353b3d6ecb6a07d1f5486ab20306be8134 (diff) | |
Merge branch 'dev' into wip/win
Conflicts:
src/bluetooth/bluetooth.pro
src/bluetooth/qbluetoothlocaldevice_p.h
Change-Id: Ic50580a3828e6c1f7c71fc79e1247df73cc1ecb7
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 1507373f..c490ca85 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -267,7 +267,7 @@ private: QBluetoothLocalDevice *q_ptr; }; -#else +#elif !defined(QT_OSX_BLUETOOTH) class QBluetoothLocalDevicePrivate : public QObject { public: |