diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:12:52 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-01-05 12:13:16 +0100 |
| commit | a3cf9d99b303baaca0d1b0fbaa1b1923c06d18cc (patch) | |
| tree | f6343d37558880cd0e93ae9229a5cdf0ac16dc56 /src/bluetooth/osx | |
| parent | 2c1d2691e853812a06d435ffcf61e17f82edb224 (diff) | |
| parent | aea5e3971986b4beba395985108fcad2c0c98c37 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into dev
Change-Id: I97b51eb3fe2040711c00da67bbb1954fc2e65c1f
Diffstat (limited to 'src/bluetooth/osx')
| -rw-r--r-- | src/bluetooth/osx/osxbtcentralmanager.mm | 1 | ||||
| -rw-r--r-- | src/bluetooth/osx/osxbtutility_p.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm index e197a78c..21ba1b81 100644 --- a/src/bluetooth/osx/osxbtcentralmanager.mm +++ b/src/bluetooth/osx/osxbtcentralmanager.mm @@ -43,7 +43,6 @@ #include <algorithm> #include <limits> - Q_DECLARE_METATYPE(QLowEnergyCharacteristic) Q_DECLARE_METATYPE(QLowEnergyDescriptor) Q_DECLARE_METATYPE(QLowEnergyHandle) diff --git a/src/bluetooth/osx/osxbtutility_p.h b/src/bluetooth/osx/osxbtutility_p.h index 3506b0d1..8816d6f3 100644 --- a/src/bluetooth/osx/osxbtutility_p.h +++ b/src/bluetooth/osx/osxbtutility_p.h @@ -94,8 +94,7 @@ public: } }; -typedef ObjCScopedPointer<NSAutoreleasePool> AutoreleasePool; -#define QT_BT_MAC_AUTORELEASEPOOL const OSXBluetooth::AutoreleasePool pool([[NSAutoreleasePool alloc] init]) +#define QT_BT_MAC_AUTORELEASEPOOL const QMacAutoReleasePool pool; template<class T> class ObjCStrongReference { |