diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 18:18:29 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-09-16 18:18:29 +0000 |
| commit | 6b9c57f8cd3df65702db327616913fa9d8172237 (patch) | |
| tree | 087d7035f7f722279c35f28f7f65f508bdc157f6 /src/plugins/platforms/winrt/qwinrtscreen.cpp | |
| parent | 8a2401bd45bb5991cf4c6a69539cb58f72e19994 (diff) | |
| parent | 59b275b2842b33e6e86233261fb921747c11cc54 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6.2' into 5.6" into refs/staging/5.6
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtscreen.cpp')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.cpp b/src/plugins/platforms/winrt/qwinrtscreen.cpp index dd2ebee3d5..3be17b0180 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.cpp +++ b/src/plugins/platforms/winrt/qwinrtscreen.cpp @@ -767,7 +767,7 @@ void QWinRTScreen::addWindow(QWindow *window) updateWindowTitle(window->title()); QWindowSystemInterface::handleWindowActivated(window, Qt::OtherFocusReason); handleExpose(); - QWindowSystemInterface::flushWindowSystemEvents(); + QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); #if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP) QWinRTDrag::instance()->setDropTarget(window); @@ -785,7 +785,7 @@ void QWinRTScreen::removeWindow(QWindow *window) if (wasTopWindow) QWindowSystemInterface::handleWindowActivated(Q_NULLPTR, Qt::OtherFocusReason); handleExpose(); - QWindowSystemInterface::flushWindowSystemEvents(); + QWindowSystemInterface::flushWindowSystemEvents(QEventLoop::ExcludeUserInputEvents); #if _MSC_VER >= 1900 && !defined(QT_NO_DRAGANDDROP) if (wasTopWindow) QWinRTDrag::instance()->setDropTarget(topWindow()); |