diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index 526542a6175..748a295afd8 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -393,14 +393,6 @@ ActionManagerPrivate::~ActionManagerPrivate()
     qDeleteAll(m_idCmdMap);
 }
 
-QDebug operator<<(QDebug d, const Context &context)
-{
-    d << "CONTEXT: ";
-    foreach (Id id, context)
-        d << "   " << id.toString();
-    return d;
-}
-
 void ActionManagerPrivate::setContext(const Context &context)
 {
     // here are possibilities for speed optimization if necessary:
diff --git a/src/plugins/coreplugin/icontext.cpp b/src/plugins/coreplugin/icontext.cpp
index d7b395aabf4..64f6e869edc 100644
--- a/src/plugins/coreplugin/icontext.cpp
+++ b/src/plugins/coreplugin/icontext.cpp
@@ -24,3 +24,23 @@
 ****************************************************************************/
 
 #include "icontext.h"
+
+#include <QDebug>
+
+QDebug operator<<(QDebug debug, const Core::Context &context)
+{
+    debug.nospace() << "Context(";
+    Core::Context::const_iterator it = context.begin();
+    Core::Context::const_iterator end = context.end();
+    if (it != end) {
+        debug << *it;
+        ++it;
+    }
+    while (it != end) {
+        debug << ", " << *it;
+        ++it;
+    }
+    debug << ')';
+
+    return debug;
+}
diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h
index b2153656a78..0baf9eee23f 100644
--- a/src/plugins/coreplugin/icontext.h
+++ b/src/plugins/coreplugin/icontext.h
@@ -84,3 +84,4 @@ protected:
 };
 
 } // namespace Core
+CORE_EXPORT QDebug operator<<(QDebug debug, const Core::Context &context);