9 files changed, 34 insertions, 31 deletions
diff --git a/examples/bluetooth/btchat/chat.cpp b/examples/bluetooth/btchat/chat.cpp
index b323b2a3..bf794902 100644
--- a/examples/bluetooth/btchat/chat.cpp
+++ b/examples/bluetooth/btchat/chat.cpp
@@ -7,19 +7,20 @@
 #include "remoteselector.h"
 #include "ui_chat.h"
 
-#include <QtCore/qdebug.h>
+#include <QDebug>
 
-#include <QtBluetooth/qbluetoothdeviceinfo.h>
-#include <QtBluetooth/qbluetoothlocaldevice.h>
-#include <QtBluetooth/qbluetoothuuid.h>
+#include <QBluetoothDeviceInfo>
+#include <QBluetoothLocalDevice>
+#include <QBluetoothUuid>
 
-#include <QtGui/qguiapplication.h>
-#include <QtGui/qstylehints.h>
+#include <QGuiApplication>
+#include <QStyleHints>
 
 #if QT_CONFIG(permissions)
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qpermissions.h>
-#include <QtWidgets/qmessagebox.h>
+#include <QCoreApplication>
+#include <QPermissions>
+
+#include <QMessageBox>
 #endif
 
 using namespace Qt::StringLiterals;
diff --git a/examples/bluetooth/btchat/chat.h b/examples/bluetooth/btchat/chat.h
index 6230e639..ca5318cc 100644
--- a/examples/bluetooth/btchat/chat.h
+++ b/examples/bluetooth/btchat/chat.h
@@ -1,9 +1,9 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QtWidgets/qdialog.h>
+#include <QDialog>
 
-#include <QtBluetooth/qbluetoothhostinfo.h>
+#include <QBluetoothHostInfo>
 
 QT_BEGIN_NAMESPACE
 namespace Ui {
diff --git a/examples/bluetooth/btchat/chatclient.cpp b/examples/bluetooth/btchat/chatclient.cpp
index f69fc455..18e100a2 100644
--- a/examples/bluetooth/btchat/chatclient.cpp
+++ b/examples/bluetooth/btchat/chatclient.cpp
@@ -3,9 +3,10 @@
 
 #include "chatclient.h"
 
-#include <QtCore/qmetaobject.h>
+#include <QMetaEnum>
+#include <QMetaObject>
 
-#include <QtBluetooth/qbluetoothserviceinfo.h>
+#include <QBluetoothServiceInfo>
 
 using namespace  Qt::StringLiterals;
 
diff --git a/examples/bluetooth/btchat/chatclient.h b/examples/bluetooth/btchat/chatclient.h
index 829562ac..da75bf51 100644
--- a/examples/bluetooth/btchat/chatclient.h
+++ b/examples/bluetooth/btchat/chatclient.h
@@ -4,9 +4,9 @@
 #ifndef CHATCLIENT_H
 #define CHATCLIENT_H
 
-#include <QtCore/qobject.h>
+#include <QObject>
 
-#include <QtBluetooth/qbluetoothsocket.h>
+#include <QBluetoothSocket>
 
 QT_FORWARD_DECLARE_CLASS(QBluetoothServiceInfo)
 
diff --git a/examples/bluetooth/btchat/chatserver.cpp b/examples/bluetooth/btchat/chatserver.cpp
index 7a6ef80d..addbc1a9 100644
--- a/examples/bluetooth/btchat/chatserver.cpp
+++ b/examples/bluetooth/btchat/chatserver.cpp
@@ -3,8 +3,8 @@
 
 #include "chatserver.h"
 
-#include <QtBluetooth/qbluetoothserver.h>
-#include <QtBluetooth/qbluetoothsocket.h>
+#include <QBluetoothServer>
+#include <QBluetoothSocket>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/btchat/chatserver.h b/examples/bluetooth/btchat/chatserver.h
index a8811f77..ab60cad6 100644
--- a/examples/bluetooth/btchat/chatserver.h
+++ b/examples/bluetooth/btchat/chatserver.h
@@ -4,10 +4,10 @@
 #ifndef CHATSERVER_H
 #define CHATSERVER_H
 
-#include <QtCore/qobject.h>
+#include <QObject>
 
-#include <QtBluetooth/qbluetoothaddress.h>
-#include <QtBluetooth/qbluetoothserviceinfo.h>
+#include <QBluetoothAddress>
+#include <QBluetoothServiceInfo>
 
 QT_FORWARD_DECLARE_CLASS(QBluetoothServer)
 QT_FORWARD_DECLARE_CLASS(QBluetoothSocket)
diff --git a/examples/bluetooth/btchat/main.cpp b/examples/bluetooth/btchat/main.cpp
index 16c8e272..1da4f9f5 100644
--- a/examples/bluetooth/btchat/main.cpp
+++ b/examples/bluetooth/btchat/main.cpp
@@ -3,8 +3,9 @@
 
 #include "chat.h"
 
-#include <QtCore/qloggingcategory.h>
-#include <QtWidgets/qapplication.h>
+#include <QLoggingCategory>
+
+#include <QApplication>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/btchat/remoteselector.cpp b/examples/bluetooth/btchat/remoteselector.cpp
index 2c1f9a00..dc501c82 100644
--- a/examples/bluetooth/btchat/remoteselector.cpp
+++ b/examples/bluetooth/btchat/remoteselector.cpp
@@ -4,15 +4,15 @@
 #include "remoteselector.h"
 #include "ui_remoteselector.h"
 
-#include <QtBluetooth/qbluetoothaddress.h>
-#include <QtBluetooth/qbluetoothlocaldevice.h>
-#include <QtBluetooth/qbluetoothservicediscoveryagent.h>
-#include <QtBluetooth/qbluetoothuuid.h>
+#include <QBluetoothAddress>
+#include <QBluetoothLocalDevice>
+#include <QBluetoothServiceDiscoveryAgent>
+#include <QBluetoothUuid>
 
-#include <QtGui/qguiapplication.h>
-#include <QtGui/qstylehints.h>
+#include <QGuiApplication>
+#include <QStyleHints>
 
-#include <QtWidgets/qlistwidget.h>
+#include <QListWidget>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/btchat/remoteselector.h b/examples/bluetooth/btchat/remoteselector.h
index 6d5ba034..c6fc665b 100644
--- a/examples/bluetooth/btchat/remoteselector.h
+++ b/examples/bluetooth/btchat/remoteselector.h
@@ -4,9 +4,9 @@
 #ifndef REMOTESELECTOR_H
 #define REMOTESELECTOR_H
 
-#include <QtWidgets/qdialog.h>
+#include <QDialog>
 
-#include <QtBluetooth/qbluetoothserviceinfo.h>
+#include <QBluetoothServiceInfo>
 
 QT_BEGIN_NAMESPACE