summaryrefslogtreecommitdiff
path: root/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
diff options
context:
space:
mode:
authorIvan Solovev <ivan.solovev@qt.io>2021-01-22 14:14:49 +0100
committerIvan Solovev <ivan.solovev@qt.io>2021-01-26 17:20:35 +0100
commit37ff0744c8c5f15606dbc2391b630ea433c3c939 (patch)
tree57bee3560bae24dd574ea330d28f9aa26c3fb126 /src/plugins/position/android/src/qgeopositioninfosource_android.cpp
parent82bc59433ba56139730382881438996c63cad68d (diff)
downloadqtlocation-37ff0744c8c5f15606dbc2391b630ea433c3c939.tar.gz
QtPositioning: remove QGeoPositionInfoSource::updateTimeout signal
A new Error::UpdateTimeoutError enum value is introduced instead. An errorOccurred() signal with this value is used to notify about update timeouts. As a result, an updateTimeout() signal is also removed from QML PositionSource object (QDeclarativePositionSource C++ class). It's also replaced by the sourceErrorChanged() signal with PositionSource.UpdateTimeoutError error value. Apart from that - several more warnings in the unit tests are fixed. [ChangeLog][QtPositioning][Important Behavior Changes] Removed QGeoPositionInfoSource::updateTimeout() signal. Use QGeoPositionInfoSource::errorOccurred() with a new Error::UpdateTimeoutError value instead. Removed PositionSource::updateTimeout() signal from QML. Use PositionSource::sourceErrorChanged() with a new PositionSource.UpdateTimeoutError value instead. Task-number: QTBUG-90491 Change-Id: I7458382a5cb7fdea192b3924baf9e86ee28d1028 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/plugins/position/android/src/qgeopositioninfosource_android.cpp')
-rw-r--r--src/plugins/position/android/src/qgeopositioninfosource_android.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
index 0cf68c6d..4bff1da6 100644
--- a/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
+++ b/src/plugins/position/android/src/qgeopositioninfosource_android.cpp
@@ -160,7 +160,7 @@ void QGeoPositionInfoSourceAndroid::requestUpdate(int timeout)
return;
if (timeout != 0 && timeout < minimumUpdateInterval()) {
- emit updateTimeout();
+ setError(QGeoPositionInfoSource::UpdateTimeoutError);
return;
}
@@ -218,7 +218,7 @@ void QGeoPositionInfoSourceAndroid::requestTimeout()
const int count = queuedSingleUpdates.count();
if (!count) {
- emit updateTimeout();
+ setError(QGeoPositionInfoSource::UpdateTimeoutError);
return;
}