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

* origin/5.9:

  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:
  .qmake.conf

Change-Id: I83f4f8a507586d50423d0a2bb1dd4b69557b38ed

1 files changed, 7 insertions, 3 deletions

diff --git a/src/networksettings/qnetworksettingsmanager.cpp b/src/networksettings/qnetworksettingsmanager.cpp
index caf6057..dafc0b1 100644
--- a/src/networksettings/qnetworksettingsmanager.cpp
+++ b/src/networksettings/qnetworksettingsmanager.cpp
@@ -33,6 +33,8 @@
 #include "qnetworksettingsmanager_p.h"
 #include <QStringListModel>
 
+QT_BEGIN_NAMESPACE
+
 QNetworkSettingsManager::QNetworkSettingsManager(QObject *parent) :
    QObject(parent)
    ,d_ptr(new QNetworkSettingsManagerPrivate(this))
@@ -42,20 +44,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, const 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;
         }
@@ -74,3 +76,5 @@ QNetworkSettingsUserAgent* QNetworkSettingsManager::userAgent()
     Q_D(QNetworkSettingsManager);
     return d->userAgent();
 }
+
+QT_END_NAMESPACE