diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-17 10:38:48 +0100 |
| commit | 8fe7fbe6b552b0d196967cfea85fede5e7c211b9 (patch) | |
| tree | b90f246cc3b8847cedaf6b5f8dc045cfc563b9be /src/bluetooth/qnx/ppshelpers_p.h | |
| parent | 9bcb79f0c741f7805dad17c467a5c2041227a18a (diff) | |
| parent | b4bde05d8459cc57c25bac3f7be19fcf03908606 (diff) | |
Merge branch 'dev' into btle
Conflicts:
examples/bluetooth/bluetooth.pro
src/bluetooth/doc/src/examples.qdoc
src/bluetooth/qbluetoothdevicediscoveryagent_qnx.cpp
src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
src/bluetooth/qbluetoothservicediscoveryagent_p.h
src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp
Change-Id: Ie1577e4b0f469cd5a6b05a61cbe94f180a64448d
Diffstat (limited to 'src/bluetooth/qnx/ppshelpers_p.h')
| -rw-r--r-- | src/bluetooth/qnx/ppshelpers_p.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h index 1633bab8..0eaea981 100644 --- a/src/bluetooth/qnx/ppshelpers_p.h +++ b/src/bluetooth/qnx/ppshelpers_p.h @@ -57,23 +57,20 @@ #include <errno.h> #include <sys/pps.h> -#include <QSocketNotifier> -#include <QStringList> +#include <QtCore/QLoggingCategory> +#include <QtCore/QSocketNotifier> +#include <QtCore/QStringList> #include <QtBluetooth/qbluetoothuuid.h> #include <QtBluetooth/qbluetoothaddress.h> -#ifdef BT_BBPPSDEBUG -#define qBBBluetoothDebug qDebug -#else -#define qBBBluetoothDebug QT_NO_QDEBUG_MACRO -#endif - #define BT_SPP_SERVER_SUBTYPE 1 #define BT_SPP_CLIENT_SUBTYPE 2 QT_BEGIN_NAMESPACE +Q_DECLARE_LOGGING_CATEGORY(QT_BT_QNX) + class BBSocketNotifier : public QObject { Q_OBJECT |