From 30d06289682fd434fedeb7d3a59e79b480f06c83 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 20 Dec 2010 16:18:22 +0100
Subject: [PATCH] macro plugin: compile fix with namespaced Qt

---
 src/plugins/macros/actionmacrohandler.h |  4 +++-
 src/plugins/macros/macromanager.h       |  8 +++++---
 src/plugins/macros/macrooptionswidget.h |  2 ++
 src/plugins/macros/macrosettings.h      | 10 ++++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/plugins/macros/actionmacrohandler.h b/src/plugins/macros/actionmacrohandler.h
index 9d3cb92086..704818cc2a 100644
--- a/src/plugins/macros/actionmacrohandler.h
+++ b/src/plugins/macros/actionmacrohandler.h
@@ -36,10 +36,12 @@
 
 #include "imacrohandler.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
+QT_BEGIN_NAMESPACE
 class QAction;
 class QSignalMapper;
+QT_END_NAMESPACE
 
 namespace Macros {
 namespace Internal {
diff --git a/src/plugins/macros/macromanager.h b/src/plugins/macros/macromanager.h
index 9298a1e6fc..1ba95b240a 100644
--- a/src/plugins/macros/macromanager.h
+++ b/src/plugins/macros/macromanager.h
@@ -34,12 +34,14 @@
 #ifndef MACROSPLUGIN_MACROMANAGER_H
 #define MACROSPLUGIN_MACROMANAGER_H
 
-#include <QObject>
-#include <QMap>
-
 #include "macros_global.h"
 
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+
+QT_BEGIN_NAMESPACE
 class QAction;
+QT_END_NAMESPACE
 
 namespace Macros {
 
diff --git a/src/plugins/macros/macrooptionswidget.h b/src/plugins/macros/macrooptionswidget.h
index 565c0450de..16e17f4383 100644
--- a/src/plugins/macros/macrooptionswidget.h
+++ b/src/plugins/macros/macrooptionswidget.h
@@ -39,7 +39,9 @@
 #include <QMap>
 #include <QStringList>
 
+QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
+QT_END_NAMESPACE
 
 
 namespace Macros {
diff --git a/src/plugins/macros/macrosettings.h b/src/plugins/macros/macrosettings.h
index 5fcae26c8b..62466dcc09 100644
--- a/src/plugins/macros/macrosettings.h
+++ b/src/plugins/macros/macrosettings.h
@@ -34,12 +34,14 @@
 #ifndef MACROSPLUGIN_MACROSETTINGS_H
 #define MACROSPLUGIN_MACROSETTINGS_H
 
-#include <QString>
-#include <QStringList>
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
+QT_BEGIN_NAMESPACE
 class QSettings;
+QT_END_NAMESPACE
 
 namespace Macros {
 namespace Internal {
-- 
2.11.0