Bug 778024 - Bug 774139 will break Qt/Maemo builds due to #define signals. r=dougt NPODB
authorOleg Romashin <oleg.romashin@nokia.com>
Wed, 01 Aug 2012 12:00:44 -0700
changeset 101088 278d4641b7391eb06cdeb09176794fd49c1d965c
parent 101087 e54118dd247177942a56d4e3aaf2687a1b120830
child 101089 a25d0900dcdaffbddda671eccd24be7f3018f3c9
child 101144 8b0faad0630d74b7686e0dfa26d5c5863db46594
push id23213
push userromaxa@gmail.com
push dateWed, 01 Aug 2012 19:05:10 +0000
treeherdermozilla-central@278d4641b739 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdougt
bugs778024, 774139
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 778024 - Bug 774139 will break Qt/Maemo builds due to #define signals. r=dougt NPODB
dom/plugins/ipc/PluginInstanceChild.cpp
widget/qt/mozqwidget.cpp
widget/qt/nsWindow.cpp
--- a/dom/plugins/ipc/PluginInstanceChild.cpp
+++ b/dom/plugins/ipc/PluginInstanceChild.cpp
@@ -5,16 +5,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
 #include <QEvent>
 #include <QKeyEvent>
 #include <QApplication>
 #include <QInputMethodEvent>
 #include "nsQtKeyUtils.h"
+#include "NestedLoopTimer.h"
 #endif
 
 #include "PluginBackgroundDestroyer.h"
 #include "PluginInstanceChild.h"
 #include "PluginModuleChild.h"
 #include "BrowserStreamChild.h"
 #include "PluginStreamChild.h"
 #include "StreamNotifyChild.h"
--- a/widget/qt/mozqwidget.cpp
+++ b/widget/qt/mozqwidget.cpp
@@ -5,17 +5,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include <QGraphicsSceneHoverEvent>
 #include <QGraphicsSceneMouseEvent>
 #if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
 #include <QInputContext>
 #endif
 #include <QtCore/QTimer>
-
+// Solve conflict of qgl.h and GLDefs.h
+#define GLdouble_defined 1
 #include "mozqwidget.h"
 #include "nsWindow.h"
 
 #include "nsIObserverService.h"
 #include "mozilla/Services.h"
 
 
 #ifdef MOZ_ENABLE_QTMOBILITY
--- a/widget/qt/nsWindow.cpp
+++ b/widget/qt/nsWindow.cpp
@@ -5,16 +5,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/Util.h"
 #include "BasicLayers.h"
 
 #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>
 #include <QIcon>
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QGraphicsSceneContextMenuEvent>
 #include <QGraphicsSceneDragDropEvent>
@@ -96,17 +98,16 @@ using namespace QtMobility;
 #if MOZ_PLATFORM_MAEMO == 6
 #include <X11/Xatom.h>
 static Atom sPluginIMEAtom = nullptr;
 #define PLUGIN_VKB_REQUEST_PROP "_NPAPI_PLUGIN_REQUEST_VKB"
 #include <QThread>
 #endif
 #endif //MOZ_X11
 
-#define GLdouble_defined 1
 #include "Layers.h"
 #include "LayerManagerOGL.h"
 #include "nsFastStartupQt.h"
 
 // If embedding clients want to create widget without real parent window
 // then nsIBaseWindow->Init() should have parent argument equal to PARENTLESS_WIDGET
 #define PARENTLESS_WIDGET (void*)0x13579