From 6e1d9f9b96bf14213e74779f7611bad304b20ecd Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Fri, 16 Oct 2015 13:45:45 +0200
Subject: QmlDebug: Don't duplicate Qt namespace when importing debug plugins

Q_IMPORT_PLUGIN already adds the Qt namespace to the symbols.

Task-number: QTBUG-48415
Change-Id: I25b4ffdcddd0bdd52bfd390964b9c1a333a79b30
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/qml/debugger/qqmldebugpluginmanager_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/qml')

diff --git a/src/qml/debugger/qqmldebugpluginmanager_p.h b/src/qml/debugger/qqmldebugpluginmanager_p.h
index f8fa94f318..6fffa67d7b 100644
--- a/src/qml/debugger/qqmldebugpluginmanager_p.h
+++ b/src/qml/debugger/qqmldebugpluginmanager_p.h
@@ -70,7 +70,9 @@ QT_BEGIN_NAMESPACE
 
 #ifdef QT_STATIC
 #define Q_QML_IMPORT_DEBUG_PLUGIN(className)\
-    Q_IMPORT_PLUGIN(className)
+    QT_END_NAMESPACE\
+    Q_IMPORT_PLUGIN(className)\
+    QT_BEGIN_NAMESPACE
 #else
 #define Q_QML_IMPORT_DEBUG_PLUGIN(className)
 #endif // QT_STATIC
-- 
cgit v1.2.3