diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:22:31 +0200 |
| commit | 8146a18be0c98751816ffe40661308081a57573d (patch) | |
| tree | 69a2ddc07bad88df0d27d6b9a33ebb1ac522b71a /src/bluetooth/qbluetoothlocaldevice_p.h | |
| parent | 9f4c45b58b82b59740dc60e22cba6894efd6c164 (diff) | |
| parent | 167faeec86ed4d9c9f099f5180784c7b0cb9aa42 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp
Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 637587f5..5d84af7e 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -34,6 +34,17 @@ #ifndef QBLUETOOTHLOCALDEVICE_P_H #define QBLUETOOTHLOCALDEVICE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtBluetooth/qbluetoothglobal.h> #include "qbluetoothlocaldevice.h" |