Merge remote-tracking branch 'gerrit/dev' into win

Change-Id: I28ee9f95cc0fb85a36b5bd7b2ad87e0179446995

1 files changed, 3 insertions, 3 deletions

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index 246de953..4b1a72c1 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -40,7 +40,7 @@
 #ifndef QBLUETOOTHSERVICEDISCOVERYAGENT_H
 #define QBLUETOOTHSERVICEDISCOVERYAGENT_H
 
-#include <QtBluetooth/qbluetoothglobal.h>
+#include <QtBluetooth/qtbluetoothglobal.h>
 
 #include <QtCore/QObject>
 
@@ -80,8 +80,8 @@ public:
     };
     Q_ENUM(DiscoveryMode)
 
-    explicit QBluetoothServiceDiscoveryAgent(QObject *parent = Q_NULLPTR);
-    explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = Q_NULLPTR);
+    explicit QBluetoothServiceDiscoveryAgent(QObject *parent = nullptr);
+    explicit QBluetoothServiceDiscoveryAgent(const QBluetoothAddress &deviceAdapter, QObject *parent = nullptr);
     ~QBluetoothServiceDiscoveryAgent();
 
     bool isActive() const;