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

8 files changed, 36 insertions, 5 deletions

diff --git a/src/imports/bluetoothsettings/plugin.cpp b/src/imports/bluetoothsettings/plugin.cpp
index cd2cfcf..6c5fcf1 100644
--- a/src/imports/bluetoothsettings/plugin.cpp
+++ b/src/imports/bluetoothsettings/plugin.cpp
@@ -107,6 +107,9 @@
 
     \sa requestConnect()
 */
+
+QT_BEGIN_NAMESPACE
+
 template <typename T>
 QObject *instance(QQmlEngine *engine, QJSEngine *) {
     T *t = new T(engine);
@@ -128,4 +131,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #include "plugin.moc"
diff --git a/src/imports/displaysettings/plugin.cpp b/src/imports/displaysettings/plugin.cpp
index 366ab0b..fd88a1a 100644
--- a/src/imports/displaysettings/plugin.cpp
+++ b/src/imports/displaysettings/plugin.cpp
@@ -84,6 +84,8 @@
     used or not.
 */
 
+QT_BEGIN_NAMESPACE
+
 template <typename T>
 QObject *instance(QQmlEngine *engine, QJSEngine *) {
     T *t = new T(engine);
@@ -104,4 +106,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #include "plugin.moc"
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 8c10510..c39e30f 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,8 +1,9 @@
 TEMPLATE = subdirs
-SUBDIRS += networksettings \
-    localesettings \
-    timedatesettings \
-    localdevice \
+
+SUBDIRS += localdevice \
     displaysettings
 
-qtHaveModule(bluetooth): SUBDIRS += bluetoothsettings
+qtHaveModule(bluetoothsettings): SUBDIRS += bluetoothsettings
+qtHaveModule(networksettings): SUBDIRS += networksettings
+qtHaveModule(localesettings): SUBDIRS += localesettings
+qtHaveModule(timedatesettings): SUBDIRS += timedatesettings
diff --git a/src/imports/localdevice/plugin.cpp b/src/imports/localdevice/plugin.cpp
index ca9fe68..785b364 100644
--- a/src/imports/localdevice/plugin.cpp
+++ b/src/imports/localdevice/plugin.cpp
@@ -85,6 +85,8 @@
     \sa reboot()
 */
 
+QT_BEGIN_NAMESPACE
+
 static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
 {
    Q_UNUSED(engine)
@@ -111,4 +113,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #include "plugin.moc"
diff --git a/src/imports/localesettings/plugin.cpp b/src/imports/localesettings/plugin.cpp
index 60c19c1..db90003 100644
--- a/src/imports/localesettings/plugin.cpp
+++ b/src/imports/localesettings/plugin.cpp
@@ -148,6 +148,8 @@
     from a list.
 */
 
+QT_BEGIN_NAMESPACE
+
 template <typename T>
 QObject *instance(QQmlEngine *engine, QJSEngine *) {
     T *t = new T(engine);
@@ -168,4 +170,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #include "plugin.moc"
diff --git a/src/imports/networksettings/plugin.cpp b/src/imports/networksettings/plugin.cpp
index 665cb6a..ebebf98 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -151,6 +151,8 @@
     This signal is emitted when the connection failed due to invalid user credentials.
 */
 
+QT_BEGIN_NAMESPACE
+
 template <typename T>
 QObject *instance(QQmlEngine *engine, QJSEngine *) {
     T *t = new T(engine);
@@ -174,3 +176,5 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri)
 
     qmlRegisterSingletonType<QNetworkSettingsManager>(uri, 1, 0, "NetworkSettingsManager", &instance<QNetworkSettingsManager>);
 }
+
+QT_END_NAMESPACE
diff --git a/src/imports/networksettings/plugin.h b/src/imports/networksettings/plugin.h
index 61f148c..e5c7bc7 100644
--- a/src/imports/networksettings/plugin.h
+++ b/src/imports/networksettings/plugin.h
@@ -31,6 +31,8 @@
 
 #include <QQmlExtensionPlugin>
 
+QT_BEGIN_NAMESPACE
+
 class NetworksettingspluginPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -40,5 +42,7 @@ public:
     void registerTypes(const char *uri);
 };
 
+QT_END_NAMESPACE
+
 #endif // NETWORKSETTINGSPLUGIN_PLUGIN_H
 
diff --git a/src/imports/timedatesettings/plugin.cpp b/src/imports/timedatesettings/plugin.cpp
index 9ebe945..0ddfed4 100644
--- a/src/imports/timedatesettings/plugin.cpp
+++ b/src/imports/timedatesettings/plugin.cpp
@@ -138,6 +138,9 @@
     {TimeManager.timeZone}, when the user selects a time zone
     from a list.
 */
+
+QT_BEGIN_NAMESPACE
+
 template <typename T>
 QObject *instance(QQmlEngine *engine, QJSEngine *) {
     T *t = new T(engine);
@@ -158,4 +161,6 @@ public:
     }
 };
 
+QT_END_NAMESPACE
+
 #include "plugin.moc"