diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 832985e5656..69f240661e9 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -41,6 +41,11 @@
 
 #include "nscore.h"
 #include "nsPluginHostImpl.h"
+#ifdef MOZ_WIDGET_QT
+#undef CursorShape /*X.h defines it as 0,
+                     qnamespace.h makes an enum type by that name
+                   */
+#endif
 #include <stdio.h>
 #include "prio.h"
 #include "prmem.h"