diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-02 12:30:54 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-06-02 11:32:10 +0000 |
| commit | 6b6b4fea87b7b9063299e4b15adf307f71319cf1 (patch) | |
| tree | 844d9655aaab4a240138d1f2e59ab912af474dd4 /src/bluetooth/osx/osxbtdevicepair.mm | |
| parent | 6b5ef56a9f4d92c4a50ce098e9cf323f528b29ee (diff) | |
QtBluetooth: remove outdate code (OS X/iOS)
Since we now have OS X 10.9 and iOS 7.0 as the minimal required
(SDK and deployment target) - get rid of outdated code-branches
in _SDK_EQUAL_OR_ABOVE etc.
Change-Id: I5f546e8bb746f6b94f26a40460b3caa0af6a531c
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/bluetooth/osx/osxbtdevicepair.mm')
| -rw-r--r-- | src/bluetooth/osx/osxbtdevicepair.mm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/bluetooth/osx/osxbtdevicepair.mm b/src/bluetooth/osx/osxbtdevicepair.mm index 737a312f..c9458255 100644 --- a/src/bluetooth/osx/osxbtdevicepair.mm +++ b/src/bluetooth/osx/osxbtdevicepair.mm @@ -41,7 +41,6 @@ #include "osxbtutility_p.h" #include <QtCore/qloggingcategory.h> -#include <QtCore/qsysinfo.h> #include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE @@ -91,18 +90,8 @@ using namespace QT_NAMESPACE; - (void)dealloc { -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9) - // Stop also sets a delegate to nil (Apple's docs). - // 10.9 only. - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9) - [m_pairing stop]; - else - [m_pairing setDelegate:nil]; -#else - [m_pairing setDelegate:nil]; -#endif + [m_pairing stop]; [m_pairing release]; - [super dealloc]; } |