Bug 564402 - slots #define in Qt, prevents Qt builds on trunk

layout/generic/nsObjectFrame.cpp

@@ -51,6 +51,14 @@
 #ifdef MOZ_X11
 #include <QX11Info>
 #endif
+
+/*
+ * "slots" gets #defined by Qt, unfortunately its a common identifier,
+ * especially it is used as a local variable name in nsIFrame.h - since
+ * we don't use the Qt #defined "slots" we undefine it again here.
+ */
+#undef slots
+
 #endif
 
 #include "nscore.h"

widget/src/qt/nsNativeThemeQt.cpp

@@ -49,6 +49,13 @@
 #include <QFlags>
 #include <QStyleOptionComboBox>
 
+/*
+ * "slots" gets #defined by Qt, unfortunately its a common identifier,
+ * especially it is used as a local variable name in nsIFrame.h - since
+ * we don't use the Qt #defined "slots" we undefine it again here.
+ */
+#undef slots
+
 #include "nsIFrame.h"
 
 #include "nsCoord.h"