diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-04-20 11:52:57 +0300 |
| commit | fb3e9bc2d941462f1244aaf0ea79425a307f883d (patch) | |
| tree | afce91959098ec887ce466abc6e40342261df3db /src/location/qmlbackendao_s60.cpp | |
| parent | c61d909c7b815319e40ba27d7f84e92aa5f1f946 (diff) | |
| parent | 6f0dc7cc40dd63763a581a7fb6d4e76649b8026c (diff) | |
Merge branch 'master' into 1.2.0v1.2.0
Diffstat (limited to 'src/location/qmlbackendao_s60.cpp')
| -rw-r--r-- | src/location/qmlbackendao_s60.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp index 55093a5afb..8674f37e4f 100644 --- a/src/location/qmlbackendao_s60.cpp +++ b/src/location/qmlbackendao_s60.cpp @@ -430,7 +430,9 @@ int CQMLBackendAO::setUpdateInterval(int aMilliSec) // If msec is not 0 and is less than the value returned by minimumUpdateInterval(), // the interval will be set to the minimum interval. - if (aMilliSec != 0 && aMilliSec <= minimumUpdateInterval) { + // if (aMilliSec != 0 && aMilliSec <= minimumUpdateInterval) { + // workaround, not accepting zero as value, see QTMOBILITY-995 + if (aMilliSec <= minimumUpdateInterval) { mUpdateInterval = minimumUpdateInterval; } else { mUpdateInterval = aMilliSec; @@ -444,7 +446,6 @@ int CQMLBackendAO::setUpdateInterval(int aMilliSec) // will set Either zero, minimum or +ve value // seconds converted to TTimeIntervalMicroSeconds aPosOption.SetUpdateInterval(TTimeIntervalMicroSeconds(mUpdateInterval * 1000)); - // set the timeout to the smaller of 150% of interval or update interval + 10 seconds TInt64 mUpdateTimeout = (mUpdateInterval * 3) / 2; if (mUpdateTimeout > mUpdateInterval + 10000) |