Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-12 10:40:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 587715 - Include Qt headers before anything else because of conflicts with X and mozalloc. r=bustage fix

Browse Source
This commit is contained in:
Benjamin Smedberg 2010-08-17 10:35:21 -04:00
parent 4606a9bb94
commit f1f5bf227b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -5284,7 +5284,7 @@ then
if test -z "$QTDIR"; then
PKG_CHECK_MODULES(MOZ_QT, QtGui QtNetwork QtCore QtOpenGL)
AC_CHECK_PROGS(HOST_MOC, moc, "")
AC_CHECK_PROGS(HOST_MOC, $MOC moc, "")
else
MOZ_QT_LIBS="-L$QTDIR/lib/ -lQtGui -lQtNetwork -lQtCore -lQtDBus -lQtXml -lQtOpenGL"

16
layout/generic/nsObjectFrame.cpp
View File

@ -46,6 +46,14 @@
/* rendering objects for replaced elements implemented by a plugin */
#ifdef MOZ_WIDGET_QT
#include <QWidget>
#include <QKeyEvent>
#ifdef MOZ_X11
#include <QX11Info>
#endif
#endif
#ifdef MOZ_IPC
#include "mozilla/plugins/PluginMessageUtils.h"
#endif
@ -60,14 +68,6 @@ enum { XKeyPress = KeyPress };
#endif
#endif
#ifdef MOZ_WIDGET_QT
#include <QWidget>
#include <QKeyEvent>
#ifdef MOZ_X11
#include <QX11Info>
#endif
#endif
#include "nscore.h"
#include "nsCOMPtr.h"
#include "nsPresContext.h"