1 files changed, 21 insertions, 7 deletions
diff --git a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
index fd00f8ac8b..07f10da99a 100644
--- a/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
+++ b/src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h
@@ -69,16 +69,32 @@ void accessibleDebugClientCalls_helper(const char* funcName, const QAccessibleIn
 
 QWindow *window_helper(const QAccessibleInterface *iface);
 
+class QWindowsAccessibleGuid // Helper for QDebug, outputs known ids by name.
+{
+public:
+    explicit QWindowsAccessibleGuid(const GUID &g) : m_guid(g) {}
+    GUID guid () const { return m_guid; }
+    static const char *iidToString(const GUID &id);
+
+private:
+    GUID m_guid;
+};
+
+#ifndef QT_NO_DEBUG_STREAM
+QDebug operator<<(QDebug d, const QWindowsAccessibleGuid &aguid);
+#endif
+
 /**************************************************************\
  *                     QWindowsAccessible                     *
  **************************************************************/
-class QWindowsMsaaAccessible : public
-#ifdef Q_CC_MINGW
-        IAccessible
+
+#ifndef Q_CC_MINGW
+typedef IAccessible2 AccessibleBase;
 #else
-        IAccessible2
+typedef IAccessible AccessibleBase;
 #endif
-        , public IOleWindow
+
+class QWindowsMsaaAccessible : public AccessibleBase, public IOleWindow
 {
 public:
     QWindowsMsaaAccessible(QAccessibleInterface *a)
@@ -132,8 +148,6 @@ public:
     HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode);
 
 protected:
-    virtual QByteArray IIDToString(REFIID id);
-
     QAccessible::Id id;
 
     QAccessibleInterface *accessibleInterface() const