From 442c069d4343b2df418bc35bd9f9818220a963be Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@dougt.org>
Date: Thu, 18 Nov 2010 20:28:59 -0800
Subject: [PATCH] Fixing build bustage on QT caused by JS using QT defined
 |slot|. r=blassey, a=npodb

--HG--
extra : rebase_source : 95a43e2d76bcfde38b9daac03729db8f2601f66e
---
 layout/generic/nsObjectFrame.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
index 0709bab524fe..fa79fd2427ff 100644
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -52,6 +52,7 @@
 #ifdef MOZ_X11
 #include <QX11Info>
 #endif
+#undef slots
 #endif
 
 #ifdef MOZ_IPC