Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 778024 - Bug 774139 will break Qt/Maemo builds due to #define signals. r=dougt NPODB

Browse Source
This commit is contained in:
Oleg Romashin 2012-08-01 12:00:44 -07:00
parent 836c09b2ff
commit 4f8882a570
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom/plugins/ipc/PluginInstanceChild.cpp
View File

@ -10,6 +10,7 @@
#include <QApplication>
#include <QInputMethodEvent>
#include "nsQtKeyUtils.h"
#include "NestedLoopTimer.h"
#endif
#include "PluginBackgroundDestroyer.h"

3
widget/qt/mozqwidget.cpp
View File

@ -10,7 +10,8 @@
#include <QInputContext>
#endif
#include <QtCore/QTimer>
// Solve conflict of qgl.h and GLDefs.h
#define GLdouble_defined 1
#include "mozqwidget.h"
#include "nsWindow.h"

3
widget/qt/nsWindow.cpp
View File

@ -10,6 +10,8 @@
#include <QtOpenGL/QGLWidget>
#include <QtOpenGL/QGLContext>
// Solve conflict of qgl.h and GLDefs.h
#define GLdouble_defined 1
#include <QApplication>
#include <QDesktopWidget>
#include <QtGui/QCursor>
@ -101,7 +103,6 @@ static Atom sPluginIMEAtom = nullptr;
#endif
#endif //MOZ_X11
#define GLdouble_defined 1
#include "Layers.h"
#include "LayerManagerOGL.h"
#include "nsFastStartupQt.h"