Fix qmake warnings about incorrect header includes in public headers.

Change-Id: I4b6ff895a021665b18b007c8bd8a7059cbba3ab1
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>

27 files changed, 50 insertions, 50 deletions

diff --git a/src/bluetooth/qbluetooth.h b/src/bluetooth/qbluetooth.h
index 4ee90336..3c3c6d31 100644
--- a/src/bluetooth/qbluetooth.h
+++ b/src/bluetooth/qbluetooth.h
@@ -43,7 +43,7 @@
 #ifndef QBLUETOOTH_H
 #define QBLUETOOTH_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothaddress.h b/src/bluetooth/qbluetoothaddress.h
index 9f7e0e75..b7ad9232 100644
--- a/src/bluetooth/qbluetoothaddress.h
+++ b/src/bluetooth/qbluetoothaddress.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHADDRESS_H
 #define QBLUETOOTHADDRESS_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QtCore/QByteArray>
 #include <QtCore/QString>
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.h b/src/bluetooth/qbluetoothdevicediscoveryagent.h
index b6af066c..4b3e664f 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.h
@@ -42,11 +42,11 @@
 #ifndef QBLUETOOTHDEVICEDISCOVERYAGENT_H
 #define QBLUETOOTHDEVICEDISCOVERYAGENT_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QObject>
 
-#include <qbluetoothdeviceinfo.h>
+#include <QtBluetooth/QBluetoothDeviceInfo>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h
index 32765a2d..ab9c2320 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.h
+++ b/src/bluetooth/qbluetoothdeviceinfo.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHDEVICEINFO_H
 #define QBLUETOOTHDEVICEINFO_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QString>
 
diff --git a/src/bluetooth/qbluetoothhostinfo.h b/src/bluetooth/qbluetoothhostinfo.h
index 85db2b46..bdb95ae0 100644
--- a/src/bluetooth/qbluetoothhostinfo.h
+++ b/src/bluetooth/qbluetoothhostinfo.h
@@ -42,8 +42,8 @@
 #ifndef QBLUETOOTHHOSTINFO_H
 #define QBLUETOOTHHOSTINFO_H
 
-#include "qbluetoothglobal.h"
-#include "qbluetoothaddress.h"
+#include <QtBluetooth/qbluetoothglobal.h>
+#include <QtBluetooth/QBluetoothAddress>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 4c84a12d..e414ec85 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -43,13 +43,13 @@
 #ifndef QBLUETOOTHLOCALDEVICE_H
 #define QBLUETOOTHLOCALDEVICE_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QObject>
 #include <QtCore/QList>
 #include <QString>
 
-#include "qbluetoothhostinfo.h"
+#include <QtBluetooth/QBluetoothHostInfo>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h
index 58fff254..31825370 100644
--- a/src/bluetooth/qbluetoothlocaldevice_p.h
+++ b/src/bluetooth/qbluetoothlocaldevice_p.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHLOCALDEVICE_P_H
 #define QBLUETOOTHLOCALDEVICE_P_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include "qbluetoothlocaldevice.h"
 
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index a47ad64d..6753b5cd 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -42,12 +42,12 @@
 #ifndef QBLUETOOTHSERVICEDISCOVERYAGENT_H
 #define QBLUETOOTHSERVICEDISCOVERYAGENT_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QObject>
 
-#include <qbluetoothserviceinfo.h>
-#include <qbluetoothuuid.h>
+#include <QtBluetooth/QBluetoothServiceInfo>
+#include <QtBluetooth/QBluetoothUuid>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothserviceinfo.h b/src/bluetooth/qbluetoothserviceinfo.h
index db83a23d..dcbfed27 100644
--- a/src/bluetooth/qbluetoothserviceinfo.h
+++ b/src/bluetooth/qbluetoothserviceinfo.h
@@ -42,9 +42,9 @@
 #ifndef QBLUETOOTHSERVICEINFO_H
 #define QBLUETOOTHSERVICEINFO_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
-#include <qbluetoothuuid.h>
+#include <QtBluetooth/QBluetoothUuid>
 
 #include <QtCore/QMetaType>
 #include <QtCore/QList>
@@ -70,7 +70,7 @@ public:
         PrimaryLanguageBase = 0x0100,
         ServiceName = PrimaryLanguageBase + 0x0000,
         ServiceDescription = PrimaryLanguageBase + 0x0001,
-        ServiceProvider = PrimaryLanguageBase + 0x0002,
+        ServiceProvider = PrimaryLanguageBase + 0x0002
     };
 
     enum Protocol {
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index f131514a..d1aaf524 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -42,10 +42,10 @@
 #ifndef QBLUETOOTHSOCKET_H
 #define QBLUETOOTHSOCKET_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
-#include <qbluetoothaddress.h>
-#include <qbluetoothuuid.h>
+#include <QtBluetooth/QBluetoothAddress>
+#include <QtBluetooth/QBluetoothUuid>
 
 #include <QIODevice>
 #include <QtNetwork/QAbstractSocket>
diff --git a/src/bluetooth/qbluetoothtransfermanager.h b/src/bluetooth/qbluetoothtransfermanager.h
index 8a113dad..80943db1 100644
--- a/src/bluetooth/qbluetoothtransfermanager.h
+++ b/src/bluetooth/qbluetoothtransfermanager.h
@@ -42,8 +42,8 @@
 #ifndef QBLUETOOTHTRANSFERMANAGER_H
 #define QBLUETOOTHTRANSFERMANAGER_H
 
-#include "qbluetoothglobal.h"
-#include <qbluetoothaddress.h>
+#include <QtBluetooth/qbluetoothglobal.h>
+#include <QtBluetooth/QBluetoothAddress>
 
 #include <QtCore/QObject>
 
diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h
index ae496184..7c244fc3 100644
--- a/src/bluetooth/qbluetoothtransferreply.h
+++ b/src/bluetooth/qbluetoothtransferreply.h
@@ -44,8 +44,8 @@
 
 #include <QtCore/QIODevice>
 
-#include <qbluetoothtransferrequest.h>
-#include <qbluetoothtransfermanager.h>
+#include <QtBluetooth/QBluetoothTransferRequest>
+#include <QtBluetooth/QBluetoothTransferManager>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qbluetoothtransferreply_bluez_p.h b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
index 64411778..c94447b8 100644
--- a/src/bluetooth/qbluetoothtransferreply_bluez_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_bluez_p.h
@@ -45,8 +45,8 @@
 #include <QtCore/QIODevice>
 #include <QtDBus/QtDBus>
 
-#include <qbluetoothtransferrequest.h>
-#include <qbluetoothtransfermanager.h>
+#include <QtBluetooth/QBluetoothTransferRequest>
+#include <QtBluetooth/QBluetoothTransferManager>
 
 #include "qbluetoothtransferreply.h"
 
diff --git a/src/bluetooth/qbluetoothtransferrequest.h b/src/bluetooth/qbluetoothtransferrequest.h
index 92065d28..058c0af7 100644
--- a/src/bluetooth/qbluetoothtransferrequest.h
+++ b/src/bluetooth/qbluetoothtransferrequest.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHTRANSFERREQUEST_H
 #define QBLUETOOTHTRANSFERREQUEST_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QtCore/QtGlobal>
 #include <QtCore/QVariant>
diff --git a/src/bluetooth/qbluetoothtransferrequest_p.h b/src/bluetooth/qbluetoothtransferrequest_p.h
index af527374..ab330bfa 100644
--- a/src/bluetooth/qbluetoothtransferrequest_p.h
+++ b/src/bluetooth/qbluetoothtransferrequest_p.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHTRANSFERREQUESTPRIVATE_H
 #define QBLUETOOTHTRANSFERREQUESTPRIVATE_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 #include "qbluetoothtransferrequest.h"
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 2065ba2c..01bcff26 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -42,7 +42,7 @@
 #ifndef QBLUETOOTHUUID_H
 #define QBLUETOOTHUUID_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QtCore/QtGlobal>
 #include <QtCore/QMetaType>
diff --git a/src/bluetooth/ql2capserver.h b/src/bluetooth/ql2capserver.h
index 8f61589a..2ea2c637 100644
--- a/src/bluetooth/ql2capserver.h
+++ b/src/bluetooth/ql2capserver.h
@@ -42,13 +42,13 @@
 #ifndef QL2CAPSERVER_H
 #define QL2CAPSERVER_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QObject>
 
-#include <qbluetoothaddress.h>
-#include <qbluetooth.h>
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothAddress>
+#include <QtBluetooth/qbluetooth.h>
+#include <QtBluetooth/QBluetoothSocket>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/ql2capserver_p.h b/src/bluetooth/ql2capserver_p.h
index 8689fddd..6357584a 100644
--- a/src/bluetooth/ql2capserver_p.h
+++ b/src/bluetooth/ql2capserver_p.h
@@ -42,8 +42,8 @@
 #ifndef QL2CAPSERVER_P_H
 #define QL2CAPSERVER_P_H
 
-#include "qbluetoothglobal.h"
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/qbluetoothglobal.h>
+#include <QtBluetooth/QBluetoothSocket>
 
 #ifdef QT_BLUEZ_BLUETOOTH
 QT_FORWARD_DECLARE_CLASS(QSocketNotifier)
diff --git a/src/bluetooth/ql2capsocket.h b/src/bluetooth/ql2capsocket.h
index ed162578..c60166cf 100644
--- a/src/bluetooth/ql2capsocket.h
+++ b/src/bluetooth/ql2capsocket.h
@@ -42,8 +42,8 @@
 #ifndef QL2CAPSOCKET_H
 #define QL2CAPSOCKET_H
 
-#include <qbluetoothsocket.h>
-#include <qbluetoothaddress.h>
+#include <QtBluetooth/QBluetoothSocket>
+#include <QtBluetooth/QBluetoothAddress>
 
 #include <QtCore/QObject>
 
diff --git a/src/bluetooth/qnx/ppshelpers_p.h b/src/bluetooth/qnx/ppshelpers_p.h
index 086a7306..dfaf3efe 100644
--- a/src/bluetooth/qnx/ppshelpers_p.h
+++ b/src/bluetooth/qnx/ppshelpers_p.h
@@ -60,8 +60,8 @@
 #include <QSocketNotifier>
 #include <QStringList>
 
-#include <qbluetoothuuid.h>
-#include <qbluetoothaddress.h>
+#include <QtBluetooth/qbluetoothuuid.h>
+#include <QtBluetooth/qbluetoothaddress.h>
 
 #ifdef BT_BBPPSDEBUG
 #define qBBBluetoothDebug qDebug
diff --git a/src/bluetooth/qrfcommserver.h b/src/bluetooth/qrfcommserver.h
index 8fe7d67e..523b7d3d 100644
--- a/src/bluetooth/qrfcommserver.h
+++ b/src/bluetooth/qrfcommserver.h
@@ -42,13 +42,13 @@
 #ifndef QRFCOMMSERVER_H
 #define QRFCOMMSERVER_H
 
-#include "qbluetoothglobal.h"
+#include <QtBluetooth/qbluetoothglobal.h>
 
 #include <QObject>
 
-#include <qbluetoothaddress.h>
-#include <qbluetooth.h>
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothAddress>
+#include <QtBluetooth/qbluetooth.h>
+#include <QtBluetooth/QBluetoothSocket>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/bluetooth/qrfcommserver_p.h b/src/bluetooth/qrfcommserver_p.h
index 50c30fcf..7060d6ec 100644
--- a/src/bluetooth/qrfcommserver_p.h
+++ b/src/bluetooth/qrfcommserver_p.h
@@ -44,7 +44,7 @@
 
 #include <QtGlobal>
 #include <QList>
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothSocket>
 #include "qbluetooth.h"
 
 #ifdef QTM_QNX_BLUETOOTH
diff --git a/src/bluetooth/qrfcommsocket.h b/src/bluetooth/qrfcommsocket.h
index 9bb18f76..7cf1a0d5 100644
--- a/src/bluetooth/qrfcommsocket.h
+++ b/src/bluetooth/qrfcommsocket.h
@@ -42,7 +42,7 @@
 #ifndef QRFCOMMSOCKET_H
 #define QRFCOMMSOCKET_H
 
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothSocket>
 
 QT_BEGIN_NAMESPACE_BLUETOOTH
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
index f7428744..260ed6ec 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel.cpp
@@ -44,7 +44,7 @@
 #include <QPixmap>
 
 #include <qbluetoothdeviceinfo.h>
-#include <qbluetoothaddress.h>
+#include <QtBluetooth/QBluetoothAddress>
 
 #include "qdeclarativebluetoothservice_p.h"
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
index b38dee34..3f2a4cf5 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice.cpp
@@ -42,8 +42,8 @@
 #include "qdeclarativebluetoothservice_p.h"
 
 #include <qbluetoothdeviceinfo.h>
-#include <qbluetoothsocket.h>
-#include <qbluetoothaddress.h>
+#include <QtBluetooth/QBluetoothSocket>
+#include <QtBluetooth/QBluetoothAddress>
 #include <ql2capserver.h>
 #include <qrfcommserver.h>
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
index a282879a..78a837f0 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket.cpp
@@ -48,8 +48,8 @@
 
 
 #include <qbluetoothdeviceinfo.h>
-#include <qbluetoothaddress.h>
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothAddress>
+#include <QtBluetooth/QBluetoothSocket>
 #include <ql2capserver.h>
 #include <qrfcommserver.h>
 
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
index c18e597a..ce29eb33 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
@@ -46,7 +46,7 @@
 #include <qqml.h>
 #include <QQmlParserStatus>
 
-#include <qbluetoothsocket.h>
+#include <QtBluetooth/QBluetoothSocket>
 
 #include "qdeclarativebluetoothservice_p.h"