Merge remote-tracking branch 'origin/5.10' into dev

 * origin/5.10:
   Merge remote-tracking branch 'origin/5.9' into 5.10
   Fix compilation with namespaces
   Import only available modules
   Update license headers
   Verify that Qtdbus module is available
   tests: add tests.pro for CI
   Doc: Bump version to 5.9.3

 Conflicts:
	src/bluetoothsettings/discoverymodel.cpp
	src/localesettings/localefiltermodel.cpp
	src/localesettings/localemodel.cpp
	src/timedatesettings/timezonefiltermodel.cpp

Change-Id: Iabf7f372c634abea2734c97d748b3e836394ddb1

5 files changed, 19 insertions, 4 deletions

diff --git a/src/bluetoothsettings/bluetoothdevice.cpp b/src/bluetoothsettings/bluetoothdevice.cpp
index 0facf27..442a31c 100644
--- a/src/bluetoothsettings/bluetoothdevice.cpp
+++ b/src/bluetoothsettings/bluetoothdevice.cpp
@@ -30,6 +30,8 @@
 #include "bluetoothdevice.h"
 #include "bluetoothdevice_p.h"
 
+QT_BEGIN_NAMESPACE
+
 BluetoothDevice::BluetoothDevice(QObject *parent) : QObject(parent)
   ,d_ptr(new BluetoothDevicePrivate(this))
 {
@@ -51,7 +53,7 @@ void BluetoothDevice::setPowered(const bool& aPowered)
 DiscoveryModel* BluetoothDevice::deviceModel() const
 {
     Q_D(const BluetoothDevice);
-    return d->m_deviceModel;
+    return d->deviceModel();
 }
 
 bool BluetoothDevice::scanning() const
@@ -89,3 +91,5 @@ bool BluetoothDevice::available() const
     Q_D(const BluetoothDevice);
     return d->available();
 }
+
+QT_END_NAMESPACE
diff --git a/src/bluetoothsettings/bluetoothdevice.h b/src/bluetoothsettings/bluetoothdevice.h
index 03ea961..1c51b87 100644
--- a/src/bluetoothsettings/bluetoothdevice.h
+++ b/src/bluetoothsettings/bluetoothdevice.h
@@ -32,11 +32,11 @@
 #include <QObject>
 #include "discoverymodel.h"
 
-QT_BEGIN_NAMESPACE
-
 QT_FORWARD_DECLARE_CLASS(DiscoveryModel)
 QT_FORWARD_DECLARE_CLASS(BluetoothDevicePrivate)
 
+QT_BEGIN_NAMESPACE
+
 class Q_DECL_EXPORT BluetoothDevice : public QObject
 {
     Q_OBJECT
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
index 48e6695..8850f14 100644
--- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
+++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
@@ -35,6 +35,8 @@
 #include "connman_technology_interface.h"
 #include "connmancommon.h"
 
+QT_BEGIN_NAMESPACE
+
 BluetoothDevicePrivate::BluetoothDevicePrivate(BluetoothDevice *parent) : QObject(parent)
     ,q_ptr(parent)
     ,m_localDevice(Q_NULLPTR)
@@ -265,3 +267,5 @@ OrgBluezDevice1Interface* BluetoothDevicePrivate::findPeerDevice(const QString &
     }
     return NULL;
 }
+
+QT_END_NAMESPACE
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h
index c3cc3f3..0c32a2f 100644
--- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h
+++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h
@@ -45,10 +45,13 @@
 #include <QtDBus>
 #include "bluetoothdevice.h"
 
+// Automatically generated classes in global namespace
 class OrgBluezDevice1Interface;
 class OrgFreedesktopDBusObjectManagerInterface;
 class NetConnmanTechnologyInterface;
 
+QT_BEGIN_NAMESPACE
+
 class BluetoothDevicePrivate : public QObject
 {
     Q_OBJECT
@@ -92,6 +95,6 @@ private:
     NetConnmanTechnologyInterface *m_technology;
 };
 
-
+QT_END_NAMESPACE
 
 #endif // BLUETOOTHDEVICE__P_H
diff --git a/src/bluetoothsettings/discoverymodel.cpp b/src/bluetoothsettings/discoverymodel.cpp
index ad174c7..31cf972 100644
--- a/src/bluetoothsettings/discoverymodel.cpp
+++ b/src/bluetoothsettings/discoverymodel.cpp
@@ -29,6 +29,8 @@
 #include <QBluetoothAddress>
 #include "discoverymodel.h"
 
+QT_BEGIN_NAMESPACE
+
 BtDeviceItem::BtDeviceItem(const QBluetoothDeviceInfo& bt, QObject *parent)
     : QObject(parent)
     ,m_name(bt.name())
@@ -264,3 +266,5 @@ void DiscoveryModel::clearDeviceList()
     m_items.clear();
     endResetModel();
 }
+
+QT_END_NAMESPACE