Bug 572295 - Add "X11Util" to be shared between X11 toolkits. Qt bustage fix. r=jones.chris.g

This commit is contained in:
Oleg Romashin 2010-06-22 19:50:47 -04:00
parent 20a7dcab0c
commit df368b7846

View File

@ -45,6 +45,9 @@
#if defined(MOZ_WIDGET_GTK2) #if defined(MOZ_WIDGET_GTK2)
# include <gdk/gdkx.h> # include <gdk/gdkx.h>
#elif defined(MOZ_WIDGET_QT) #elif defined(MOZ_WIDGET_QT)
// X11/X.h has #define CursorShape 0, but Qt's qnamespace.h defines
// enum CursorShape { ... }. Good times!
#undef CursorShape
# include <QX11Info> # include <QX11Info>
#else #else
# error Unknown toolkit # error Unknown toolkit