From 724309463d63480ca755d5f309825a9dd078d012 Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Wed, 22 Nov 2017 17:01:06 +0200 Subject: Fix compilation with namespaces Task-number: QTBUG-64693 Change-Id: I35487b54271f031077c0f96a90eb47f0683caa77 Reviewed-by: Samuli Piippo Reviewed-by: Teemu Holappa --- src/imports/networksettings/plugin.cpp | 4 ++++ src/imports/networksettings/plugin.h | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src/imports/networksettings') 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 QObject *instance(QQmlEngine *engine, QJSEngine *) { T *t = new T(engine); @@ -174,3 +176,5 @@ void NetworksettingspluginPlugin::registerTypes(const char *uri) qmlRegisterSingletonType(uri, 1, 0, "NetworkSettingsManager", &instance); } + +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 +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 -- cgit v1.2.3