Fixing build bustage on QT caused by JS using QT defined |slot|. r=blassey, a=npodb
authorDoug Turner <dougt@dougt.org>
Thu, 18 Nov 2010 20:28:59 -0800
changeset 57889 dc494e0db336ce376b47a56a87e6dfc19ceeeed7
parent 57888 54289a8057cf17ac767aef3633c23a9939c85020
child 57890 e3d3bcffefa7de908c6e1015ae137f5a94d51390
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersblassey, npodb
milestone2.0b8pre
Fixing build bustage on QT caused by JS using QT defined |slot|. r=blassey, a=npodb
layout/generic/nsObjectFrame.cpp
--- a/layout/generic/nsObjectFrame.cpp
+++ b/layout/generic/nsObjectFrame.cpp
@@ -47,16 +47,17 @@
 /* rendering objects for replaced elements implemented by a plugin */
 
 #ifdef MOZ_WIDGET_QT
 #include <QWidget>
 #include <QKeyEvent>
 #ifdef MOZ_X11
 #include <QX11Info>
 #endif
+#undef slots
 #endif
 
 #ifdef MOZ_IPC
 #include "mozilla/plugins/PluginMessageUtils.h"
 #endif
 
 #ifdef MOZ_X11
 #include <cairo-xlib.h>