Commit 0309e7a2 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

BUG: With Qt 4.6, on Windows too we see issues with double modal dialogs, so

using the same bypass as mac for windows as well. Hopefully this will fix the
windows test running issues.
parent 4a25f910
......@@ -205,7 +205,7 @@ void pqEventDispatcher::onMenuTimerTimeout()
}
QWidget* currentPopup = QApplication::activePopupWidget();
#if defined(__APPLE__)
#if defined(__APPLE__) || defined(WIN32)
if (!currentPopup)
{
currentPopup = QApplication::activeModalWidget();
......@@ -222,7 +222,7 @@ void pqEventDispatcher::onMenuTimerTimeout()
bool pqEventDispatcher::eventFilter(QObject *obj, QEvent *ev)
{
QWidget* currentPopup = QApplication::activePopupWidget();
#if defined(__APPLE__)
#if defined(__APPLE__) || defined(WIN32)
if (!currentPopup)
{
currentPopup = QApplication::activeModalWidget();
......@@ -241,7 +241,7 @@ bool pqEventDispatcher::eventFilter(QObject *obj, QEvent *ev)
this->AdhocMenuTimer.stop();
}
#if defined(__APPLE__)
#if defined(__APPLE__) || defined(WIN32)
return this->Superclass::eventFilter(obj, ev);
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment