diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-07-26 14:18:19 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-07-26 14:18:27 +0200 |
| commit | 4849c1e95bb9521d08a7f8589c16c3b5849a7712 (patch) | |
| tree | c31389410ae92cfb656de528adad766c6f512978 /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
| parent | 892d50020da29807d328b07d7568990e803c36f0 (diff) | |
| parent | 96590b7d608ef25c21a2025d368b50b56b958364 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into dev
Change-Id: Ida3681a873698f22c28bc60230ca0c49d2a9d25f
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index 13d85a94..243d7fd2 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -78,12 +78,12 @@ class QDBusVariant; QT_END_NAMESPACE #endif +QT_BEGIN_NAMESPACE + #ifdef QT_WINRT_BLUETOOTH class QWinRTBluetoothDeviceDiscoveryWorker; #endif -QT_BEGIN_NAMESPACE - class QBluetoothDeviceDiscoveryAgentPrivate #if defined(QT_ANDROID_BLUETOOTH) || defined(QT_WINRT_BLUETOOTH) : public QObject |