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

4 files changed, 15 insertions, 1 deletions

diff --git a/src/localesettings/localefiltermodel.cpp b/src/localesettings/localefiltermodel.cpp
index b0535f5..997a316 100644
--- a/src/localesettings/localefiltermodel.cpp
+++ b/src/localesettings/localefiltermodel.cpp
@@ -29,6 +29,8 @@
 #include "localemodel.h"
 #include "localefiltermodel.h"
 
+QT_BEGIN_NAMESPACE
+
 LocaleFilterModel::LocaleFilterModel(QObject* parent)
     :QSortFilterProxyModel(parent)
 {
@@ -89,7 +91,6 @@ QVariant LocaleFilterModel::itemFromRow(const int row) const
     return QVariant();
 }
 
-
 int LocaleFilterModel::indexForCountry(const QString &country) const
 {
     QAbstractItemModel *model = this->sourceModel();
@@ -98,3 +99,5 @@ int LocaleFilterModel::indexForCountry(const QString &country) const
     QModelIndex ret = mapFromSource(i);
     return ret.row();
 }
+
+QT_END_NAMESPACE
diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp
index a5249e8..6925a02 100644
--- a/src/localesettings/localemodel.cpp
+++ b/src/localesettings/localemodel.cpp
@@ -33,6 +33,7 @@
 #include <QtConcurrent/QtConcurrentRun>
 #include "localemodel.h"
 
+QT_BEGIN_NAMESPACE
 
 LocaleItem::LocaleItem(const QLocale& locale, QObject *parent)
     :QObject(parent)
@@ -172,3 +173,5 @@ QModelIndex LocaleModel::indexForCountry(const QString &country) const
     }
     return QModelIndex();
 }
+
+QT_END_NAMESPACE
diff --git a/src/localesettings/systemlocale.cpp b/src/localesettings/systemlocale.cpp
index 37f157b..e6de431 100644
--- a/src/localesettings/systemlocale.cpp
+++ b/src/localesettings/systemlocale.cpp
@@ -30,6 +30,8 @@
 #include "systemlocale.h"
 #include "systemlocale_p.h"
 
+QT_BEGIN_NAMESPACE
+
 SystemLocale::SystemLocale(QObject *parent)
     :QObject(parent)
     ,d_ptr(new SystemLocalePrivate(this))
@@ -48,3 +50,5 @@ void SystemLocale::setLocale(const QString& aLocale)
     d->setLocale(aLocale);
     emit localeChanged();
 }
+
+QT_END_NAMESPACE
diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h
index 96af3c1..a3d1a5f 100644
--- a/src/localesettings/systemlocale_p.h
+++ b/src/localesettings/systemlocale_p.h
@@ -43,6 +43,8 @@
 #include "systemlocale.h"
 #include "locale_interface.h"
 
+QT_BEGIN_NAMESPACE
+
 class SystemLocalePrivate
 {
     Q_DECLARE_PUBLIC(SystemLocale)
@@ -88,4 +90,6 @@ private:
     SystemLocale *q_ptr;
 };
 
+QT_END_NAMESPACE
+
 #endif // LOCALE_P_H