diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2017-08-21 14:20:25 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-08-30 13:33:12 +0000 |
| commit | 36997810d9fec492635152be89efaa55208e224a (patch) | |
| tree | 00743718f23b3d3a794c56e392a496bf166902cc /examples/bluetooth | |
| parent | 8f1bd6c6c017a0e28160c5325d1c5c86a3e16384 (diff) | |
Rename qbluetoothglobal.h to qtbluetoothglobal.h
... and deprecate the former. By doing so we get the header
file in line with other modules - see qtnetworkglobal.h for
example.
The include is not used in the examples so it is removed
there.
Change-Id: Ie6267738d4a45e45a0350d458a40654d8a952f4a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples/bluetooth')
| -rw-r--r-- | examples/bluetooth/btfiletransfer/progress.h | 1 | ||||
| -rw-r--r-- | examples/bluetooth/btscanner/device.h | 1 | ||||
| -rw-r--r-- | examples/bluetooth/btscanner/service.h | 1 | ||||
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.cpp | 1 | ||||
| -rw-r--r-- | examples/bluetooth/lowenergyscanner/device.h | 1 |
5 files changed, 1 insertions, 4 deletions
diff --git a/examples/bluetooth/btfiletransfer/progress.h b/examples/bluetooth/btfiletransfer/progress.h index b71009b7..8a30ff94 100644 --- a/examples/bluetooth/btfiletransfer/progress.h +++ b/examples/bluetooth/btfiletransfer/progress.h @@ -42,7 +42,6 @@ #define PROGRESS_H #include <QDialog> -#include <qbluetoothglobal.h> #include <QTime> QT_FORWARD_DECLARE_CLASS(QBluetoothTransferReply) diff --git a/examples/bluetooth/btscanner/device.h b/examples/bluetooth/btscanner/device.h index 9e5c59f6..f5b3a715 100644 --- a/examples/bluetooth/btscanner/device.h +++ b/examples/bluetooth/btscanner/device.h @@ -43,7 +43,6 @@ #include "ui_device.h" -#include <qbluetoothglobal.h> #include <qbluetoothlocaldevice.h> #include <QDialog> diff --git a/examples/bluetooth/btscanner/service.h b/examples/bluetooth/btscanner/service.h index 5b47d11a..871d975b 100644 --- a/examples/bluetooth/btscanner/service.h +++ b/examples/bluetooth/btscanner/service.h @@ -43,7 +43,6 @@ #include "ui_service.h" -#include <qbluetoothglobal.h> #include <QDialog> QT_FORWARD_DECLARE_CLASS(QBluetoothAddress) diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp index 0275c435..765a0d1c 100644 --- a/examples/bluetooth/lowenergyscanner/device.cpp +++ b/examples/bluetooth/lowenergyscanner/device.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "device.h" + #include <qbluetoothaddress.h> #include <qbluetoothdevicediscoveryagent.h> #include <qbluetoothlocaldevice.h> diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h index 331d4458..1dc10300 100644 --- a/examples/bluetooth/lowenergyscanner/device.h +++ b/examples/bluetooth/lowenergyscanner/device.h @@ -41,7 +41,6 @@ #ifndef DEVICE_H #define DEVICE_H -#include <qbluetoothglobal.h> #include <qbluetoothlocaldevice.h> #include <QObject> #include <QVariant> |