summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 17:01:06 +0200
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-24 11:53:21 +0000
commit724309463d63480ca755d5f309825a9dd078d012 (patch)
treeef26954371c0b56141ca59894f67dd14446f933b /src/imports
parent5f7d1bacb8701e24ea185c63e05e5f8883cbef2c (diff)
Fix compilation with namespaces
Task-number: QTBUG-64693 Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
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/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
7 files changed, 30 insertions, 0 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/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"