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

1 files changed, 7 insertions, 3 deletions

diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index eb687d1..71aa081 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -34,6 +34,8 @@
 #include "qnetworksettingsmanager_p.h"
 #include <QStringListModel>
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
    QObject(parent)
    ,d_ptr(new QNetworkSettingsManagerPrivate(this))
@@ -43,20 +45,20 @@ QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
 QNetworkSettingsServiceFilter *QNetworkSettingsManager::services()
 {
     Q_D(QNetworkSettingsManager);
-    return d->m_serviceFilter;
+    return d->serviceFilter();
 }
 
 QNetworkSettingsInterfaceModel *QNetworkSettingsManager::interfaces()
 {
     Q_D(QNetworkSettingsManager);
-    return &d->m_interfaceModel;
+    return d->interfaceModel();
 }
 
 QNetworkSettingsService* QNetworkSettingsManager::service(const QString& name, int type)
 {
     Q_D(QNetworkSettingsManager);
 
-    foreach (QNetworkSettingsService* service, d->m_serviceModel->getModel()) {
+    foreach (QNetworkSettingsService* service, d->serviceModel()->getModel()) {
         if (service->name() == name && service->type() == type) {
             return service;
         }
@@ -91,3 +93,5 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
     Q_D(QNetworkSettingsManager);
     return d->userAgent();
 }
+
+QT_END_NAMESPACE