summaryrefslogtreecommitdiffstats
path: root/tests/applications
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 /tests/applications
parent82bc59433ba56139730382881438996c63cad68d (diff)
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 'tests/applications')
-rw-r--r--tests/applications/positioning_backend/widget.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/applications/positioning_backend/widget.cpp b/tests/applications/positioning_backend/widget.cpp
index 627ae2d6..ea1739de 100644
--- a/tests/applications/positioning_backend/widget.cpp
+++ b/tests/applications/positioning_backend/widget.cpp
@@ -45,8 +45,6 @@ Widget::Widget(LogWidget *logWidget, QWidget *parent) :
connect(ui->horizontalSlider, SIGNAL(valueChanged(int)),
this, SLOT(setInterval(int)));
- connect(m_posSource, SIGNAL(updateTimeout()),
- this, SLOT(positionTimedOut()));
ui->groupBox->setLayout(ui->gridLayout);
ui->horizontalSlider->setMinimum(m_posSource->minimumUpdateInterval());
@@ -102,9 +100,15 @@ void Widget::positionTimedOut()
void Widget::errorChanged(QGeoPositionInfoSource::Error err)
{
- ui->labelErrorState->setText(QString::number(err));
- m_posSource->stopUpdates();
- ui->checkBox->setChecked(false);
+ if (err == QGeoPositionInfoSource::UpdateTimeoutError) {
+ // handle timeout
+ positionTimedOut();
+ } else {
+ // handle other errors
+ ui->labelErrorState->setText(QString::number(err));
+ m_posSource->stopUpdates();
+ ui->checkBox->setChecked(false);
+ }
}
Widget::~Widget()