summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:53:05 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-12-19 11:57:48 +0200
commit44d7f1865af8a8b4491f2d272f9e8e16f09c741b (patch)
treeab9b7cd2d5986e9707dad18f8447be3cc469d468 /src/imports
parent34ed89b61c06c4674260aa6f5f3139aa6310aee5 (diff)
parentb5eea82532059738a7da751222ebef68539508f1 (diff)
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
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/bluetoothsettings/plugin.cpp5
-rw-r--r--src/imports/displaysettings/plugin.cpp4
-rw-r--r--src/imports/imports.pro11
-rw-r--r--src/imports/localdevice/plugin.cpp4
-rw-r--r--src/imports/localesettings/plugin.cpp4
-rw-r--r--src/imports/networksettings/plugin.cpp4
-rw-r--r--src/imports/networksettings/plugin.h4
-rw-r--r--src/imports/timedatesettings/plugin.cpp5
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 431a099..419b685 100644
--- a/src/imports/networksettings/plugin.cpp
+++ b/src/imports/networksettings/plugin.cpp
@@ -160,6 +160,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);
@@ -184,3 +186,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"