Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/bluetooth/qbluetoothdeviceinfo.h

Change-Id: I2ad566b9ca8fb001fa91a74501e83e8a2121ef3a

9 files changed, 20 insertions, 16 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h
index f516bcec..2f17fe22 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -36,7 +36,7 @@
 
 #include <QtBluetooth/qbluetoothglobal.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtBluetooth/QBluetoothDeviceInfo>
 #include <QtBluetooth/QBluetoothAddress>
 
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 4c1e9016..4a70757f 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -36,9 +36,9 @@
 
 #include <QtBluetooth/qbluetoothglobal.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtCore/QList>
-#include <QString>
+#include <QtCore/QString>
 
 #include <QtBluetooth/QBluetoothHostInfo>
 
diff --git a/src/bluetooth/qbluetoothserver.h b/src/bluetooth/qbluetoothserver.h
index 2eadd1d4..fde07784 100644
--- a/src/bluetooth/qbluetoothserver.h
+++ b/src/bluetooth/qbluetoothserver.h
@@ -37,7 +37,7 @@
 
 #include <QtBluetooth/qbluetoothglobal.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtBluetooth/QBluetoothAddress>
 #include <QtBluetooth/qbluetooth.h>
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index d9f005cd..c038c82d 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -36,7 +36,7 @@
 
 #include <QtBluetooth/qbluetoothglobal.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <QtBluetooth/QBluetoothServiceInfo>
 #include <QtBluetooth/QBluetoothUuid>
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index e68c2bc3..e1e14cac 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -40,7 +40,7 @@
 #include <QtBluetooth/QBluetoothUuid>
 #include <QtBluetooth/QBluetoothServiceInfo>
 
-#include <QIODevice>
+#include <QtCore/QIODevice>
 #include <QtNetwork/QAbstractSocket>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h
index 94ed6651..ec9ddd71 100644
--- a/src/bluetooth/qlowenergycontroller.h
+++ b/src/bluetooth/qlowenergycontroller.h
@@ -34,7 +34,7 @@
 #ifndef QLOWENERGYCONTROLLER_H
 #define QLOWENERGYCONTROLLER_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtBluetooth/QBluetoothAddress>
 #include <QtBluetooth/QBluetoothDeviceInfo>
 #include <QtBluetooth/QBluetoothUuid>
diff --git a/src/nfc/qnearfieldmanager_qnx.cpp b/src/nfc/qnearfieldmanager_qnx.cpp
index 6e3b0eb9..78b1231c 100644
--- a/src/nfc/qnearfieldmanager_qnx.cpp
+++ b/src/nfc/qnearfieldmanager_qnx.cpp
@@ -85,7 +85,7 @@ void QNearFieldManagerPrivateImpl::stopTargetDetection()
 int QNearFieldManagerPrivateImpl::registerNdefMessageHandler(QObject *object, const QMetaMethod &method)
 {
     QList<QByteArray> filterList;
-    filterList += "*";
+    filterList += '*';
     QNXNFCManager::instance()->updateNdefFilters(filterList, this);
 
     ndefMessageHandlers.append(QPair<QPair<int, QObject *>, QMetaMethod>(QPair<int, QObject *>(m_handlerID, object), method));
@@ -180,7 +180,7 @@ void QNearFieldManagerPrivateImpl::updateNdefFilter()
     qQNXNFCDebug() << "Updating NDEF filter";
     QList<QByteArray> filterList;
     if (ndefMessageHandlers.size() > 0) { ///SUbscribe for all ndef messages
-        filterList += "*";
+        filterList += '*';
         QNXNFCManager::instance()->updateNdefFilters(filterList, this);
     } else if (ndefFilterHandlers.size() > 0){
         for (int i = 0; i < ndefFilterHandlers.count(); i++) {
diff --git a/src/nfc/qnearfieldsharetarget.h b/src/nfc/qnearfieldsharetarget.h
index 41d6880d..822a8ed5 100644
--- a/src/nfc/qnearfieldsharetarget.h
+++ b/src/nfc/qnearfieldsharetarget.h
@@ -36,7 +36,7 @@
 #define QNEARFIELDSHARETARGET_H
 
 #include <QtCore/QObject>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 #include <QtNfc/QNdefMessage>
 #include <QtNfc/QNearFieldShareManager>
 
diff --git a/src/tools/sdpscanner/main.cpp b/src/tools/sdpscanner/main.cpp
index 5f2fd976..cb1bdd15 100644
--- a/src/tools/sdpscanner/main.cpp
+++ b/src/tools/sdpscanner/main.cpp
@@ -141,9 +141,13 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray &
         QByteArray text = QByteArray::fromRawData(data->val.str, data->unitSize);
 
         bool hasNonPrintableChar = false;
-        for (int i = 0; i < text.count() && !hasNonPrintableChar; i++) {
-            if (!isprint(text[i])) {
+        for (int i = 0; i < text.count(); i++) {
+            if (text[i] == '\0') {
+                text.resize(i); // cut trailing content
+                break;
+            } else if (!isprint(text[i])) {
                 hasNonPrintableChar = true;
+                text.resize(text.indexOf('\0')); // cut trailing content
                 break;
             }
         }
@@ -152,10 +156,10 @@ static void parseAttributeValues(sdp_data_t *data, int indentation, QByteArray &
             xmlOutput.append("encoding=\"hex\" value=\"");
             xmlOutput.append(text.toHex());
         } else {
-            text.replace("&", "&amp");
-            text.replace("<", "&lt");
-            text.replace(">", "&gt");
-            text.replace("\"", "&quot");
+            text.replace('&', "&amp;");
+            text.replace('<', "&lt;");
+            text.replace('>', "&gt;");
+            text.replace('"', "&quot;");
 
             xmlOutput.append("value=\"");
             xmlOutput.append(text);