diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:00:45 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-22 03:00:45 +0200 |
| commit | d13960846930c5782df3aa01aaa28e202c4b2c34 (patch) | |
| tree | 4f8e64ddf234c0157c05236f1df328f117242406 /src/bluetooth/qbluetoothlocaldevice_p.cpp | |
| parent | eb78e559661ac86715d7546d28a88160acb8ec30 (diff) | |
| parent | b96ed240e7479641b9dc4feb0aee4f002228a21e (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Iad2cfc593f6a9d3b554a2d4f7c16d6173071f7c8
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index 793a8311..fa4a509e 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -51,7 +51,7 @@ QBluetoothLocalDevice::QBluetoothLocalDevice(QObject *parent) : QObject(parent), d_ptr(new QBluetoothLocalDevicePrivate(this, QBluetoothAddress())) { -#if !defined(QT_IOS_BLUETOOTH) && !defined(QT_WINRT_BLUETOOTH) +#if !defined(QT_IOS_BLUETOOTH) printDummyWarning(); #endif registerQBluetoothLocalDeviceMetaType(); @@ -85,11 +85,7 @@ void QBluetoothLocalDevice::setHostMode(QBluetoothLocalDevice::HostMode mode) QBluetoothLocalDevice::HostMode QBluetoothLocalDevice::hostMode() const { -#ifdef QT_WINRT_BLUETOOTH - return HostConnectable; -#else return HostPoweredOff; -#endif } QList<QBluetoothAddress> QBluetoothLocalDevice::connectedDevices() const @@ -116,11 +112,7 @@ QBluetoothLocalDevice::Pairing QBluetoothLocalDevice::pairingStatus( const QBluetoothAddress &address) const { Q_UNUSED(address); -#ifdef QT_WINRT_BLUETOOTH - return Paired; -#else return Unpaired; -#endif } void QBluetoothLocalDevice::pairingConfirmation(bool confirmation) |