diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-06-06 15:35:20 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-06-06 15:35:20 +1000 |
| commit | c0b09c7bd4b37e6a87ea0b2ee7ad9193fdb7af49 (patch) | |
| tree | fb77163aceabfd131fe82041996320264ce92282 | |
| parent | 1ccbeabedfea83a1c920dd35adef9f528edae680 (diff) | |
| parent | 7e157b1e021f3ad16e588d4ba81f52c9813fceb6 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo:
Exlude user input events in nested event loops
| -rw-r--r-- | src/serviceframework/ipc/objectendpoint.cpp | 2 | ||||
| -rw-r--r-- | src/systeminfo/symbian/batterystatus_s60.cpp | 2 | ||||
| -rw-r--r-- | src/systeminfo/symbian/telephonyinfo_s60.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/serviceframework/ipc/objectendpoint.cpp b/src/serviceframework/ipc/objectendpoint.cpp index 199a3b0db9..0d54b7730a 100644 --- a/src/serviceframework/ipc/objectendpoint.cpp +++ b/src/serviceframework/ipc/objectendpoint.cpp @@ -651,7 +651,7 @@ void ObjectEndPoint::waitForResponse(const QUuid& requestId) QTimer::singleShot(30000, loop, SLOT(quit())); connect(this, SIGNAL(pendingRequestFinished()), loop, SLOT(quit())); - loop->exec(); + loop->exec(QEventLoop::ExcludeUserInputEvents); delete loop; } diff --git a/src/systeminfo/symbian/batterystatus_s60.cpp b/src/systeminfo/symbian/batterystatus_s60.cpp index 7bd241392c..70528eed07 100644 --- a/src/systeminfo/symbian/batterystatus_s60.cpp +++ b/src/systeminfo/symbian/batterystatus_s60.cpp @@ -331,7 +331,7 @@ TInt CBatteryHWRM::GetAverageCurrent() TRACES ( qDebug() << "started event loop..."); } - iEventLoop->exec(); + iEventLoop->exec(QEventLoop::ExcludeUserInputEvents); StopCurrentFlowMeasurement(); #endif return iAverageCurrent; diff --git a/src/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp index d381f04434..6da2515aad 100644 --- a/src/systeminfo/symbian/telephonyinfo_s60.cpp +++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp @@ -86,7 +86,7 @@ void CTelephonyInfo::makeRequest() iEventLoop = new QEventLoop(); TRACES ( qDebug() << "started event loop..."); } - iEventLoop->exec(); //start the loop + iEventLoop->exec(QEventLoop::ExcludeUserInputEvents); //start the loop } CPhoneInfo::CPhoneInfo(CTelephony &telephony) : CTelephonyInfo(telephony), |