diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-21 15:09:33 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-03-21 15:09:33 (GMT) |
| commit | f464bef8b0d8cd30a3c795558e5a7b28635ac057 (patch) | |
| tree | 01c17f782a3b79cf71656c6910432ca43d4557d5 /src/gui/kernel/qeventdispatcher_qpa.cpp | |
| parent | 0112a4ce3980bfaf5a3e45a5f77cf65700db5436 (diff) | |
| parent | 86ceda033eda6bd615134f71b9850081a0c808c9 (diff) | |
| download | Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.zip Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.gz Qt-f464bef8b0d8cd30a3c795558e5a7b28635ac057.tar.bz2 | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/gui/kernel/qeventdispatcher_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qeventdispatcher_qpa.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp index 519d2a6..de53618 100644 --- a/src/gui/kernel/qeventdispatcher_qpa.cpp +++ b/src/gui/kernel/qeventdispatcher_qpa.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -172,7 +172,6 @@ public: { if (qApp && (qApp->thread() == QThread::currentThread())) { m_isEventLoopIntegrationRunning = true; - QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents); eventLoopIntegration->startEventLoop(); } } |