diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:32:05 +0200 |
commit | 7b443cd0fdd1940a8bfaad73df5e309a52b7669f (patch) | |
tree | d6eedd5d35db41c09864997596b0749b12a2e6f4 /src/bluetooth/osx/osxbtledeviceinquiry_p.h | |
parent | c4b8dee6b4cfdc6728094d237d7984791e2cecea (diff) | |
parent | 052e7ce371d4719df778ad8b378bcf1af14d294b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iff285e35cdca30fee28c7927bc01498d70f9de9e
Diffstat (limited to 'src/bluetooth/osx/osxbtledeviceinquiry_p.h')
-rw-r--r-- | src/bluetooth/osx/osxbtledeviceinquiry_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry_p.h b/src/bluetooth/osx/osxbtledeviceinquiry_p.h index 24bf181e..71e8ef53 100644 --- a/src/bluetooth/osx/osxbtledeviceinquiry_p.h +++ b/src/bluetooth/osx/osxbtledeviceinquiry_p.h @@ -54,6 +54,7 @@ #include "qbluetoothdevicediscoveryagent.h" #include "qbluetoothdeviceinfo.h" #include "osxbtutility_p.h" +#include "osxbluetooth_p.h" #include <QtCore/qelapsedtimer.h> #include <QtCore/qglobal.h> @@ -62,9 +63,6 @@ #include <Foundation/Foundation.h> -@class CBCentralManager; -@class CBPeripheral; - QT_BEGIN_NAMESPACE class QBluetoothUuid; |