diff options
author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-22 17:01:06 +0200 |
---|---|---|
committer | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2017-11-24 11:53:21 +0000 |
commit | 724309463d63480ca755d5f309825a9dd078d012 (patch) | |
tree | ef26954371c0b56141ca59894f67dd14446f933b /src/imports/networksettings | |
parent | 5f7d1bacb8701e24ea185c63e05e5f8883cbef2c (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/networksettings')
-rw-r--r-- | src/imports/networksettings/plugin.cpp | 4 | ||||
-rw-r--r-- | src/imports/networksettings/plugin.h | 4 |
2 files changed, 8 insertions, 0 deletions
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 |