diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-11-21 13:46:35 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-11-22 09:37:16 +0100 |
| commit | c3820b3d04aca98ee4e0d5eb85b23819c039532f (patch) | |
| tree | 3d5b149c4c32fb7934d33e114e47f05500bc2fa0 /src/bluetooth/qlowenergydescriptor.h | |
| parent | 6cdb8dc9cd8a518d050d08be79938feee7a9bde2 (diff) | |
| parent | 0446463da215fb14a6d5e70f3f9e5d8c2137d296 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into win32
Change-Id: Ie99a67b63f8259227f42f5b464c6bbc16e79313b
Diffstat (limited to 'src/bluetooth/qlowenergydescriptor.h')
| -rw-r--r-- | src/bluetooth/qlowenergydescriptor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergydescriptor.h b/src/bluetooth/qlowenergydescriptor.h index 1c913d3c..adfe1203 100644 --- a/src/bluetooth/qlowenergydescriptor.h +++ b/src/bluetooth/qlowenergydescriptor.h @@ -86,7 +86,8 @@ protected: friend class QLowEnergyControllerPrivateOSX; friend class QLowEnergyControllerPrivateWin32; friend class QLowEnergyControllerPrivateWinRT; - QLowEnergyDescriptorPrivate *data; + friend class QLowEnergyControllerPrivateWinRTNew; + QLowEnergyDescriptorPrivate *data = nullptr; QLowEnergyDescriptor(QSharedPointer<QLowEnergyServicePrivate> p, QLowEnergyHandle charHandle, |