Merge remote-tracking branch 'gerrit/5.4' into btle

Change-Id: Id28ba006101e64d2b0acd294ffc84be50993cb9e

3 files changed, 10 insertions, 2 deletions

diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp
index ffb03c27..c0562c45 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.cpp
+++ b/src/bluetooth/qbluetoothdeviceinfo.cpp
@@ -242,9 +242,11 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \enum QBluetoothDeviceInfo::CoreConfiguration
+    \since 5.4
 
     This enum describes the configuration of the device.
 
+    \value UnknownCoreConfiguration             The type of the Bluetooth device cannot be determined.
     \value BaseRateCoreConfiguration            The device is a standard Bluetooth device.
     \value BaseRateAndLowEnergyCoreConfiguration    The device is a Bluetooth Smart device with support
                                                 for standard and Low Energy device.
@@ -258,7 +260,7 @@ QBluetoothDeviceInfoPrivate::QBluetoothDeviceInfoPrivate() :
     majorDeviceClass(QBluetoothDeviceInfo::MiscellaneousDevice),
     minorDeviceClass(0),
     serviceUuidsCompleteness(QBluetoothDeviceInfo::DataUnavailable),
-    deviceCoreConfiguration(QBluetoothDeviceInfo::BaseRateCoreConfiguration)
+    deviceCoreConfiguration(QBluetoothDeviceInfo::UnknownCoreConfiguration)
 {
 }
 
@@ -513,6 +515,7 @@ QBluetoothDeviceInfo::DataCompleteness QBluetoothDeviceInfo::serviceUuidsComplet
     between regular and Low Energy devices.
 
     \sa coreConfigurations()
+    \since 5.4
 */
 void QBluetoothDeviceInfo::setCoreConfigurations(QBluetoothDeviceInfo::CoreConfigurations coreConfigs)
 {
@@ -522,10 +525,12 @@ void QBluetoothDeviceInfo::setCoreConfigurations(QBluetoothDeviceInfo::CoreConfi
 }
 
 /*!
+
     Returns the configuration of the device. If device configuration is not set,
     basic rate device configuration will be returned.
 
     \sa setCoreConfigurations()
+    \since 5.4
 */
 QBluetoothDeviceInfo::CoreConfigurations QBluetoothDeviceInfo::coreConfigurations() const
 {
diff --git a/src/bluetooth/qbluetoothdeviceinfo.h b/src/bluetooth/qbluetoothdeviceinfo.h
index d97e54de..ea8b7627 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.h
+++ b/src/bluetooth/qbluetoothdeviceinfo.h
@@ -189,6 +189,7 @@ public:
     };
 
     enum CoreConfiguration {
+        UnknownCoreConfiguration = 0x0,
         LowEnergyCoreConfiguration = 0x01,
         BaseRateCoreConfiguration = 0x02,
         BaseRateAndLowEnergyCoreConfiguration = 0x03
diff --git a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
index ea3c471c..74a27591 100644
--- a/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
+++ b/tests/auto/qbluetoothdeviceinfo/tst_qbluetoothdeviceinfo.cpp
@@ -250,6 +250,8 @@ void tst_QBluetoothDeviceInfo::tst_construction()
         QBluetoothDeviceInfo deviceInfo;
 
         QVERIFY(!deviceInfo.isValid());
+        QVERIFY(deviceInfo.coreConfigurations()
+                    == QBluetoothDeviceInfo::UnknownCoreConfiguration);
     }
 
     {
@@ -270,7 +272,7 @@ void tst_QBluetoothDeviceInfo::tst_construction()
         QCOMPARE(deviceInfo.serviceClasses(), serviceClasses);
         QCOMPARE(deviceInfo.majorDeviceClass(), majorDeviceClass);
         QCOMPARE(deviceInfo.minorDeviceClass(), minorDeviceClass);
-        QCOMPARE(deviceInfo.coreConfigurations(), QBluetoothDeviceInfo::BaseRateCoreConfiguration);
+        QCOMPARE(deviceInfo.coreConfigurations(), QBluetoothDeviceInfo::UnknownCoreConfiguration);
 
         deviceInfo.setCoreConfigurations(coreConfiguration);
         QCOMPARE(deviceInfo.coreConfigurations(), coreConfiguration);