From 724309463d63480ca755d5f309825a9dd078d012 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
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 <samuli.piippo@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
---
 src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp | 4 ++++
 src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h   | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src/settingsui/settingsuiplugin')

diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
index f428916..b985e31 100644
--- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.cpp
@@ -72,9 +72,13 @@
     to declare a custom settings UI, unless specifically required.
 */
 
+QT_BEGIN_NAMESPACE
+
 void SettingsuipluginPlugin::registerTypes(const char *uri)
 {
     // @uri QtDeviceUtilities.SettingsUI
     Q_ASSERT(uri == QLatin1String("QtDeviceUtilities.SettingsUI"));
     qmlRegisterType(QUrl("qrc:/pluginMain.qml"), uri, 1, 0, "SettingsUI");
 }
+
+QT_END_NAMESPACE
diff --git a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
index 4ab42ad..32a92b5 100644
--- a/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
+++ b/src/settingsui/settingsuiplugin/settingsuiplugin_plugin.h
@@ -31,6 +31,8 @@
 
 #include <QQmlExtensionPlugin>
 
+QT_BEGIN_NAMESPACE
+
 class SettingsuipluginPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -40,4 +42,6 @@ public:
     void registerTypes(const char *uri);
 };
 
+QT_END_NAMESPACE
+
 #endif // SETTINGSUIPLUGIN_PLUGIN_H
-- 
cgit v1.2.3