diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2019-09-05 14:03:52 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2019-09-05 15:45:00 +0200 |
| commit | dd4593c61e4b77c4e3b1ee516a1e8825ebb0197b (patch) | |
| tree | 4ef9bbe47e8a15415b07de822d58b9463ccfde6f | |
| parent | 606fbebaa4cb469f9712e9d0e7280b128eb70a20 (diff) | |
Fix build errors with clang-cl on Windows
The following errors are fixed:
error: member access into incomplete type
'ABI::Windows::Devices::Bluetooth::IBluetoothDeviceStatics'
error: unknown type name 'QMutex'; did you mean 'Mutex'?
Task-number: QTQAINFRA-2139
Change-Id: I5e5d9c0776cd9feb5d682c5a0e1be2f5173101f9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | 1 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 1 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_winrt.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp index 940aa599..ae8e9184 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp @@ -51,6 +51,7 @@ #include <QtBluetooth/private/qbluetoothutils_winrt_p.h> #include <QtCore/QLoggingCategory> #include <QtCore/private/qeventdispatcher_winrt_p.h> +#include <QtCore/qmutex.h> #include <robuffer.h> #include <wrl.h> diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 75e75aee..b2f03b9f 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -229,6 +229,7 @@ class QBluetoothLocalDevicePrivate : public QObject public: QBluetoothLocalDevicePrivate(QBluetoothLocalDevice *q, QBluetoothAddress = QBluetoothAddress()); + ~QBluetoothLocalDevicePrivate(); bool isValid() const; diff --git a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp index ae794db0..6e8b1966 100644 --- a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp @@ -114,6 +114,8 @@ QBluetoothLocalDevicePrivate::QBluetoothLocalDevicePrivate(QBluetoothLocalDevice GetActivationFactory(HString::MakeReference(RuntimeClass_Windows_Devices_Bluetooth_BluetoothDevice).Get(), &mStatics); } +QBluetoothLocalDevicePrivate::~QBluetoothLocalDevicePrivate() = default; + bool QBluetoothLocalDevicePrivate::isValid() const { return (mStatics != nullptr && mLEStatics != nullptr); |