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

1 files changed, 10 insertions, 8 deletions

diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index a1329182..75a1b85c 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -41,13 +41,13 @@
 
 #include "qdeclarativebluetoothsocket_p.h"
 
-#include <QPointer>
-#include <QStringList>
-#include <QDataStream>
-#include <QByteArray>
+#include <QtCore/QLoggingCategory>
+#include <QtCore/QPointer>
+#include <QtCore/QStringList>
+#include <QtCore/QDataStream>
+#include <QtCore/QByteArray>
 
-
-#include <qbluetoothdeviceinfo.h>
+#include <QtBluetooth/QBluetoothDeviceInfo>
 #include <QtBluetooth/QBluetoothAddress>
 #include <QtBluetooth/QBluetoothSocket>
 
@@ -75,6 +75,8 @@
     or passing in the service return from BluetoothDiscoveryModel.
  */
 
+Q_DECLARE_LOGGING_CATEGORY(QT_BT_QML)
+
 class QDeclarativeBluetoothSocketPrivate
 {
 public:
@@ -224,7 +226,7 @@ void QDeclarativeBluetoothSocket::setConnected(bool connected)
             d->connect();
         }
         else {
-            qWarning() << "BluetoothSocket::setConnected called before a service was set";
+            qCWarning(QT_BT_QML) << "BluetoothSocket::setConnected called before a service was set";
         }
     }
 
@@ -341,7 +343,7 @@ QString QDeclarativeBluetoothSocket::stringData()
 void QDeclarativeBluetoothSocket::sendStringData(const QString &data)
 {
     if (!d->m_connected || !d->m_socket){
-        qWarning() << "Writing data to unconnected socket";
+        qCWarning(QT_BT_QML) << "Writing data to unconnected socket";
         return;
     }