Bug 1023156 - Cannot build Qt with errors in gfxQtPlatforms (with Qt 5.3)

This commit is contained in:
Tatiana Meshkova
2014-11-19 22:02:51 -08:00
parent 3844cf8d89
commit 7afbcef537
13 changed files with 104 additions and 29 deletions

View File

@@ -5,10 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifdef MOZ_WIDGET_QT
// Must be included first to avoid conflicts.
#include <QtCore/QCoreApplication>
#include <QtCore/QEventLoop>
#include "NestedLoopTimer.h"
#include "PluginHelperQt.h"
#endif
#include "mozilla/plugins/PluginModuleParent.h"
@@ -1646,13 +1643,11 @@ PluginModuleParent::ContentsScaleFactorChanged(NPP instance, double aContentsSca
#endif // #if defined(XP_MACOSX)
#if defined(MOZ_WIDGET_QT)
static const int kMaxtimeToProcessEvents = 30;
bool
PluginModuleParent::AnswerProcessSomeEvents()
{
PLUGIN_LOG_DEBUG(("Spinning mini nested loop ..."));
QCoreApplication::processEvents(QEventLoop::AllEvents, kMaxtimeToProcessEvents);
PluginHelperQt::AnswerProcessSomeEvents();
PLUGIN_LOG_DEBUG(("... quitting mini nested loop"));
return true;