Bug 774813 - Bug 774139 will break Qt builds due to #define signals. r=cjones
authorOleg Romashin <romaxa@gmail.com>
Wed, 18 Jul 2012 22:45:58 -0400
changeset 99643 e2a85c456c3e0ec63502565292074a150ccf58a0
parent 99642 9b876829ed322df8cee0120ec5dfe0bb33670794
child 99644 6865bdd5ca5a7a0bc4c16551f11485399860cc3f
push id23142
push userromaxa@gmail.com
push dateThu, 19 Jul 2012 05:51:12 +0000
treeherdermozilla-central@6865bdd5ca5a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs774813, 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 774813 - Bug 774139 will break Qt builds due to #define signals. r=cjones
dom/plugins/ipc/NestedLoopTimer.h
dom/plugins/ipc/PluginModuleParent.cpp
--- a/dom/plugins/ipc/NestedLoopTimer.h
+++ b/dom/plugins/ipc/NestedLoopTimer.h
@@ -31,9 +31,11 @@ public Q_SLOTS:
 private:
     PluginModuleChild *mModule;
     QTimer *mQTimer;
 };
 
 } /* namespace plugins */
 } /* namespace mozilla */
 
+#undef slots
+
 #endif
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -8,16 +8,17 @@
 #include <glib.h>
 #elif XP_MACOSX
 #include "PluginInterposeOSX.h"
 #include "PluginUtilsOSX.h"
 #endif
 #ifdef MOZ_WIDGET_QT
 #include <QtCore/QCoreApplication>
 #include <QtCore/QEventLoop>
+#include "NestedLoopTimer.h"
 #endif
 
 #include "base/process_util.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/unused.h"
 #include "mozilla/ipc/SyncChannel.h"
 #include "mozilla/plugins/PluginModuleParent.h"