Examples: Use Qt's canonical CamelCase headers

These are the names also given in the online documentation,
so let's use them in the examples.

Change-Id: Ia10af880a0f2495094a5eb626b568da670e2848d
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 16837bf1f16d877e1f58e98ba88d599eb128762f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

34 files changed, 159 insertions, 144 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
 
diff --git a/examples/bluetooth/heartrate-game/bluetoothbaseclass.h b/examples/bluetooth/heartrate-game/bluetoothbaseclass.h
index 688a88e5..fba014f5 100644
--- a/examples/bluetooth/heartrate-game/bluetoothbaseclass.h
+++ b/examples/bluetooth/heartrate-game/bluetoothbaseclass.h
@@ -4,8 +4,9 @@
 #ifndef BLUETOOTHBASECLASS_H
 #define BLUETOOTHBASECLASS_H
 
-#include <QtCore/qobject.h>
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QObject>
+
+#include <QQmlEngine>
 
 class BluetoothBaseClass : public QObject
 {
diff --git a/examples/bluetooth/heartrate-game/connectionhandler.cpp b/examples/bluetooth/heartrate-game/connectionhandler.cpp
index 1394b057..87e64624 100644
--- a/examples/bluetooth/heartrate-game/connectionhandler.cpp
+++ b/examples/bluetooth/heartrate-game/connectionhandler.cpp
@@ -4,13 +4,13 @@
 #include "connectionhandler.h"
 #include "heartrate-global.h"
 
-#include <QtBluetooth/qtbluetooth-config.h>
+#include <qtbluetooth-config.h>
 
-#include <QtCore/qsystemdetection.h>
+#include <QtSystemDetection>
 
 #if QT_CONFIG(permissions)
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qpermissions.h>
+#include <QCoreApplication>
+#include <QPermissions>
 #endif
 
 ConnectionHandler::ConnectionHandler(QObject *parent) : QObject(parent)
diff --git a/examples/bluetooth/heartrate-game/connectionhandler.h b/examples/bluetooth/heartrate-game/connectionhandler.h
index 7cacd56f..e51fcbef 100644
--- a/examples/bluetooth/heartrate-game/connectionhandler.h
+++ b/examples/bluetooth/heartrate-game/connectionhandler.h
@@ -4,11 +4,11 @@
 #ifndef CONNECTIONHANDLER_H
 #define CONNECTIONHANDLER_H
 
-#include <QtBluetooth/qbluetoothlocaldevice.h>
+#include <QBluetoothLocalDevice>
 
-#include <QtCore/qobject.h>
+#include <QObject>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 class ConnectionHandler : public QObject
 {
diff --git a/examples/bluetooth/heartrate-game/devicefinder.cpp b/examples/bluetooth/heartrate-game/devicefinder.cpp
index 29e146c7..eaa70ca8 100644
--- a/examples/bluetooth/heartrate-game/devicefinder.cpp
+++ b/examples/bluetooth/heartrate-game/devicefinder.cpp
@@ -6,11 +6,11 @@
 #include "deviceinfo.h"
 #include "heartrate-global.h"
 
-#include <QtBluetooth/qbluetoothdeviceinfo.h>
+#include <QBluetoothDeviceInfo>
 
 #if QT_CONFIG(permissions)
-#include <QtCore/qcoreapplication.h>
-#include <QtCore/qpermissions.h>
+#include <QCoreApplication>
+#include <QPermissions>
 #endif
 
 DeviceFinder::DeviceFinder(DeviceHandler *handler, QObject *parent):
diff --git a/examples/bluetooth/heartrate-game/devicefinder.h b/examples/bluetooth/heartrate-game/devicefinder.h
index 6f1e46b7..703ef2c2 100644
--- a/examples/bluetooth/heartrate-game/devicefinder.h
+++ b/examples/bluetooth/heartrate-game/devicefinder.h
@@ -6,12 +6,12 @@
 
 #include "bluetoothbaseclass.h"
 
-#include <QtBluetooth/qbluetoothdevicediscoveryagent.h>
+#include <QBluetoothDeviceDiscoveryAgent>
 
-#include <QtCore/qtimer.h>
-#include <QtCore/qvariant.h>
+#include <QTimer>
+#include <QVariant>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 QT_BEGIN_NAMESPACE
 class QBluetoothDeviceInfo;
diff --git a/examples/bluetooth/heartrate-game/devicehandler.cpp b/examples/bluetooth/heartrate-game/devicehandler.cpp
index a90ccfa5..c264d771 100644
--- a/examples/bluetooth/heartrate-game/devicehandler.cpp
+++ b/examples/bluetooth/heartrate-game/devicehandler.cpp
@@ -5,8 +5,8 @@
 #include "deviceinfo.h"
 #include "heartrate-global.h"
 
-#include <QtCore/qendian.h>
-#include <QtCore/qrandom.h>
+#include <QtEndian>
+#include <QRandomGenerator>
 
 DeviceHandler::DeviceHandler(QObject *parent) :
     BluetoothBaseClass(parent)
diff --git a/examples/bluetooth/heartrate-game/devicehandler.h b/examples/bluetooth/heartrate-game/devicehandler.h
index eb155e5b..a010d396 100644
--- a/examples/bluetooth/heartrate-game/devicehandler.h
+++ b/examples/bluetooth/heartrate-game/devicehandler.h
@@ -6,14 +6,14 @@
 
 #include "bluetoothbaseclass.h"
 
-#include <QtBluetooth/qlowenergycontroller.h>
-#include <QtBluetooth/qlowenergyservice.h>
+#include <QLowEnergyController>
+#include <QLowEnergyService>
 
-#include <QtCore/qdatetime.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qtimer.h>
+#include <QDateTime>
+#include <QList>
+#include <QTimer>
 
-#include <QtQml/qqmlregistration.h>
+#include <QQmlEngine>
 
 class DeviceInfo;
 
diff --git a/examples/bluetooth/heartrate-game/deviceinfo.cpp b/examples/bluetooth/heartrate-game/deviceinfo.cpp
index 6cbc8ae6..9bfff540 100644
--- a/examples/bluetooth/heartrate-game/deviceinfo.cpp
+++ b/examples/bluetooth/heartrate-game/deviceinfo.cpp
@@ -4,8 +4,8 @@
 #include "deviceinfo.h"
 #include "heartrate-global.h"
 
-#include <QtBluetooth/qbluetoothaddress.h>
-#include <QtBluetooth/qbluetoothuuid.h>
+#include <QBluetoothAddress>
+#include <QBluetoothUuid>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/heartrate-game/deviceinfo.h b/examples/bluetooth/heartrate-game/deviceinfo.h
index 32010f56..19dd7afb 100644
--- a/examples/bluetooth/heartrate-game/deviceinfo.h
+++ b/examples/bluetooth/heartrate-game/deviceinfo.h
@@ -4,10 +4,10 @@
 #ifndef DEVICEINFO_H
 #define DEVICEINFO_H
 
-#include <QtBluetooth/qbluetoothdeviceinfo.h>
+#include <QBluetoothDeviceInfo>
 
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
+#include <QObject>
+#include <QString>
 
 class DeviceInfo: public QObject
 {
diff --git a/examples/bluetooth/heartrate-game/main.cpp b/examples/bluetooth/heartrate-game/main.cpp
index 50f891e1..47192114 100644
--- a/examples/bluetooth/heartrate-game/main.cpp
+++ b/examples/bluetooth/heartrate-game/main.cpp
@@ -6,13 +6,13 @@
 #include "devicehandler.h"
 #include "heartrate-global.h"
 
-#include <QtCore/qcommandlineoption.h>
-#include <QtCore/qcommandlineparser.h>
-#include <QtCore/qloggingcategory.h>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
+#include <QLoggingCategory>
 
-#include <QtGui/qguiapplication.h>
+#include <QGuiApplication>
 
-#include <QtQml/qqmlapplicationengine.h>
+#include <QQmlApplicationEngine>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/heartrate-server/main.cpp b/examples/bluetooth/heartrate-server/main.cpp
index 434d37eb..90b4461c 100644
--- a/examples/bluetooth/heartrate-server/main.cpp
+++ b/examples/bluetooth/heartrate-server/main.cpp
@@ -1,25 +1,29 @@
 // Copyright (C) 2017 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
-#include <QtBluetooth/qlowenergyadvertisingdata.h>
-#include <QtBluetooth/qlowenergyadvertisingparameters.h>
-#include <QtBluetooth/qlowenergycharacteristic.h>
-#include <QtBluetooth/qlowenergycharacteristicdata.h>
-#include <QtBluetooth/qlowenergydescriptordata.h>
-#include <QtBluetooth/qlowenergycontroller.h>
-#include <QtBluetooth/qlowenergyservice.h>
-#include <QtBluetooth/qlowenergyservicedata.h>
-#include <QtCore/qbytearray.h>
+#include <QLowEnergyAdvertisingData>
+#include <QLowEnergyAdvertisingParameters>
+#include <QLowEnergyCharacteristic>
+#include <QLowEnergyCharacteristicData>
+#include <QLowEnergyDescriptorData>
+#include <QLowEnergyController>
+#include <QLowEnergyService>
+#include <QLowEnergyServiceData>
+
+#include <QByteArray>
+
 #if defined(Q_OS_ANDROID) || defined(Q_OS_DARWIN)
-#include <QtGui/qguiapplication.h>
+#include <QGuiApplication>
 #else
-#include <QtCore/qcoreapplication.h>
+#include <QCoreApplication>
 #endif
-#include <QtCore/qlist.h>
-#include <QtCore/qloggingcategory.h>
-#include <QtCore/qtimer.h>
+
+#include <QList>
+#include <QLoggingCategory>
+#include <QTimer>
+
 #if QT_CONFIG(permissions)
-#include <QtCore/qpermissions.h>
+#include <QPermissions>
 #endif
 
 #include <memory>
diff --git a/examples/bluetooth/lowenergyscanner/characteristicinfo.cpp b/examples/bluetooth/lowenergyscanner/characteristicinfo.cpp
index 34bf82ce..59df54c1 100644
--- a/examples/bluetooth/lowenergyscanner/characteristicinfo.cpp
+++ b/examples/bluetooth/lowenergyscanner/characteristicinfo.cpp
@@ -3,9 +3,10 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "characteristicinfo.h"
-#include "qbluetoothuuid.h"
 
-#include <QtCore/qbytearray.h>
+#include <QBluetoothUuid>
+
+#include <QByteArray>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/lowenergyscanner/characteristicinfo.h b/examples/bluetooth/lowenergyscanner/characteristicinfo.h
index 7e0adbf7..a39ce823 100644
--- a/examples/bluetooth/lowenergyscanner/characteristicinfo.h
+++ b/examples/bluetooth/lowenergyscanner/characteristicinfo.h
@@ -5,12 +5,12 @@
 #ifndef CHARACTERISTICINFO_H
 #define CHARACTERISTICINFO_H
 
-#include <QtBluetooth/qlowenergycharacteristic.h>
+#include <QLowEnergyCharacteristic>
 
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
+#include <QObject>
+#include <QString>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 class CharacteristicInfo: public QObject
 {
diff --git a/examples/bluetooth/lowenergyscanner/device.cpp b/examples/bluetooth/lowenergyscanner/device.cpp
index 93960c31..87c2d9cb 100644
--- a/examples/bluetooth/lowenergyscanner/device.cpp
+++ b/examples/bluetooth/lowenergyscanner/device.cpp
@@ -4,16 +4,17 @@
 
 #include "device.h"
 
-#include <QtBluetooth/qbluetoothdeviceinfo.h>
-#include <QtBluetooth/qbluetoothuuid.h>
+#include <QBluetoothDeviceInfo>
+#include <QBluetoothUuid>
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qtimer.h>
+#include <QDebug>
+#include <QMetaObject>
+#include <QTimer>
 
 #if QT_CONFIG(permissions)
-#include <QtCore/qpermissions.h>
-#include <QtGui/qguiapplication.h>
+#include <QPermissions>
+
+#include <QGuiApplication>
 #endif
 
 using namespace Qt::StringLiterals;
diff --git a/examples/bluetooth/lowenergyscanner/device.h b/examples/bluetooth/lowenergyscanner/device.h
index d15b02dc..4a7e7f80 100644
--- a/examples/bluetooth/lowenergyscanner/device.h
+++ b/examples/bluetooth/lowenergyscanner/device.h
@@ -8,15 +8,15 @@
 #include "deviceinfo.h"
 #include "serviceinfo.h"
 
-#include <QtBluetooth/qbluetoothdevicediscoveryagent.h>
-#include <QtBluetooth/qlowenergycontroller.h>
-#include <QtBluetooth/qlowenergyservice.h>
+#include <QBluetoothDeviceDiscoveryAgent>
+#include <QLowEnergyController>
+#include <QLowEnergyService>
 
-#include <QtCore/qlist.h>
-#include <QtCore/qobject.h>
-#include <QtCore/qvariant.h>
+#include <QList>
+#include <QObject>
+#include <QVariant>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 QT_BEGIN_NAMESPACE
 class QBluetoothDeviceInfo;
diff --git a/examples/bluetooth/lowenergyscanner/deviceinfo.cpp b/examples/bluetooth/lowenergyscanner/deviceinfo.cpp
index 24ab5661..66300a28 100644
--- a/examples/bluetooth/lowenergyscanner/deviceinfo.cpp
+++ b/examples/bluetooth/lowenergyscanner/deviceinfo.cpp
@@ -5,9 +5,9 @@
 #include "deviceinfo.h"
 
 #ifdef Q_OS_DARWIN
-#  include <QtBluetooth/qbluetoothuuid.h>
+#  include <QBluetoothUuid>
 #else
-#  include <QtBluetooth/qbluetoothaddress.h>
+#  include <QBluetoothAddress>
 #endif
 
 DeviceInfo::DeviceInfo(const QBluetoothDeviceInfo &d)
diff --git a/examples/bluetooth/lowenergyscanner/deviceinfo.h b/examples/bluetooth/lowenergyscanner/deviceinfo.h
index 94b70465..7a0c7352 100644
--- a/examples/bluetooth/lowenergyscanner/deviceinfo.h
+++ b/examples/bluetooth/lowenergyscanner/deviceinfo.h
@@ -5,12 +5,12 @@
 #ifndef DEVICEINFO_H
 #define DEVICEINFO_H
 
-#include <QtBluetooth/qbluetoothdeviceinfo.h>
+#include <QBluetoothDeviceInfo>
 
-#include <QtCore/qlist.h>
-#include <QtCore/qobject.h>
+#include <QList>
+#include <QObject>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 class DeviceInfo: public QObject
 {
diff --git a/examples/bluetooth/lowenergyscanner/main.cpp b/examples/bluetooth/lowenergyscanner/main.cpp
index 411fac02..16ff1183 100644
--- a/examples/bluetooth/lowenergyscanner/main.cpp
+++ b/examples/bluetooth/lowenergyscanner/main.cpp
@@ -4,9 +4,11 @@
 
 #include "device.h"
 
-#include <QtCore/qloggingcategory.h>
-#include <QtGui/qguiapplication.h>
-#include <QtQml/qqmlapplicationengine.h>
+#include <QLoggingCategory>
+
+#include <QGuiApplication>
+
+#include <QQmlApplicationEngine>
 
 int main(int argc, char *argv[])
 {
diff --git a/examples/bluetooth/lowenergyscanner/serviceinfo.cpp b/examples/bluetooth/lowenergyscanner/serviceinfo.cpp
index 9032c7f2..d9c81a5b 100644
--- a/examples/bluetooth/lowenergyscanner/serviceinfo.cpp
+++ b/examples/bluetooth/lowenergyscanner/serviceinfo.cpp
@@ -4,8 +4,8 @@
 
 #include "serviceinfo.h"
 
-#include <QtBluetooth/qbluetoothuuid.h>
-#include <QtBluetooth/qlowenergyservice.h>
+#include <QBluetoothUuid>
+#include <QLowEnergyService>
 
 using namespace Qt::StringLiterals;
 
diff --git a/examples/bluetooth/lowenergyscanner/serviceinfo.h b/examples/bluetooth/lowenergyscanner/serviceinfo.h
index dfd0b919..f4347d47 100644
--- a/examples/bluetooth/lowenergyscanner/serviceinfo.h
+++ b/examples/bluetooth/lowenergyscanner/serviceinfo.h
@@ -5,9 +5,9 @@
 #ifndef SERVICEINFO_H
 #define SERVICEINFO_H
 
-#include <QtCore/qobject.h>
+#include <QObject>
 
-#include <QtQmlIntegration/qqmlintegration.h>
+#include <QQmlEngine>
 
 QT_BEGIN_NAMESPACE
 class QLowEnergyService;
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp
index c3cfec0e..33d5109e 100644
--- a/examples/nfc/annotatedurl/annotatedurl.cpp
+++ b/examples/nfc/annotatedurl/annotatedurl.cpp
@@ -2,22 +2,22 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 #include "annotatedurl.h"
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qlocale.h>
-#include <QtCore/qurl.h>
-
-#include <QtGui/qdesktopservices.h>
-#include <QtGui/qevent.h>
-
-#include <QtNfc/qndefmessage.h>
-#include <QtNfc/qndefnfctextrecord.h>
-#include <QtNfc/qndefnfcurirecord.h>
-#include <QtNfc/qndefrecord.h>
-#include <QtNfc/qnearfieldmanager.h>
-#include <QtNfc/qnearfieldtarget.h>
-
-#include <QtWidgets/qgridlayout.h>
-#include <QtWidgets/qlabel.h>
+#include <QDebug>
+#include <QLocale>
+#include <QUrl>
+
+#include <QDesktopServices>
+#include <QEvent>
+
+#include <QNdefMessage>
+#include <QNdefNfcTextRecord>
+#include <QNdefNfcUriRecord>
+#include <QNdefRecord>
+#include <QNearFieldManager>
+#include <QNearFieldTarget>
+
+#include <QGridLayout>
+#include <QLabel>
 
 AnnotatedUrl::AnnotatedUrl(QObject *parent)
     : QObject(parent),
diff --git a/examples/nfc/annotatedurl/annotatedurl.h b/examples/nfc/annotatedurl/annotatedurl.h
index 887e82d5..95404e55 100644
--- a/examples/nfc/annotatedurl/annotatedurl.h
+++ b/examples/nfc/annotatedurl/annotatedurl.h
@@ -4,11 +4,11 @@
 #ifndef ANNOTATEDURL_H
 #define ANNOTATEDURL_H
 
-#include <QtNfc/qndeffilter.h>
-#include <QtNfc/qndefmessage.h>
-#include <QtNfc/qnearfieldmanager.h>
+#include <QNdefFilter>
+#include <QNdefMessage>
+#include <QNearFieldManager>
 
-#include <QtCore/qobject.h>
+#include <QObject>
 
 QT_FORWARD_DECLARE_CLASS(QNearFieldTarget)
 QT_FORWARD_DECLARE_CLASS(QPixmap)
diff --git a/examples/nfc/annotatedurl/main.cpp b/examples/nfc/annotatedurl/main.cpp
index 199d7c7c..352a959b 100644
--- a/examples/nfc/annotatedurl/main.cpp
+++ b/examples/nfc/annotatedurl/main.cpp
@@ -4,11 +4,11 @@
 #include "annotatedurl.h"
 #include "mainwindow.h"
 
-#include <QtNfc/qnearfieldmanager.h>
-#include <QtNfc/qndefnfctextrecord.h>
-#include <QtNfc/qndefnfcurirecord.h>
+#include <QNearFieldManager>
+#include <QNdefNfcTextRecord>
+#include <QNdefNfcUriRecord>
 
-#include <QtWidgets/qapplication.h>
+#include <QApplication>
 
 //! [0]
 int main(int argc, char *argv[])
diff --git a/examples/nfc/annotatedurl/mainwindow.cpp b/examples/nfc/annotatedurl/mainwindow.cpp
index 233c7fb5..7b418360 100644
--- a/examples/nfc/annotatedurl/mainwindow.cpp
+++ b/examples/nfc/annotatedurl/mainwindow.cpp
@@ -3,11 +3,13 @@
 
 #include "mainwindow.h"
 
-#include <QtCore/qurl.h>
-#include <QtGui/qdesktopservices.h>
-#include <QtGui/qscreen.h>
-#include <QtWidgets/qlabel.h>
-#include <QtWidgets/qlayout.h>
+#include <QUrl>
+
+#include <QDesktopServices>
+#include <QScreen>
+
+#include <QLabel>
+#include <QLayout>
 
 MainWindow::MainWindow(QWidget *parent)
     : QWidget(parent),
diff --git a/examples/nfc/annotatedurl/mainwindow.h b/examples/nfc/annotatedurl/mainwindow.h
index 13c214ac..059c7038 100644
--- a/examples/nfc/annotatedurl/mainwindow.h
+++ b/examples/nfc/annotatedurl/mainwindow.h
@@ -4,8 +4,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/qpixmap.h>
-#include <QtWidgets/qwidget.h>
+#include <QPixmap>
+
+#include <QWidget>
 
 QT_FORWARD_DECLARE_CLASS(QMouseEvent)
 QT_FORWARD_DECLARE_CLASS(QUrl)