Add correct namespace macros around Qt classes.

This change is required to support generation of correctly namespaced
code that can be used by Qt binaries configured with the -qtnamespace
option.

Task-number: QTBUG-19579

Change-Id: I6f8db9e0c60a50b51a79c1c09ac6aa7e9ace07c0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index 9c49183..74f257b 100644 (file)
--- a/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/src/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -107,12 +107,14 @@ static const char includeList[] =
     "#include <QtCore/QVariant>\n";
 
 static const char forwardDeclarations[] =
+    "QT_BEGIN_NAMESPACE\n"
     "class QByteArray;\n"
     "template<class T> class QList;\n"
     "template<class Key, class Value> class QMap;\n"
     "class QString;\n"
     "class QStringList;\n"
-    "class QVariant;\n";
+    "class QVariant;\n"
+    "QT_END_NAMESPACE\n";
 
 static void showHelp()
 {