diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:13 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:03:13 +0100 |
commit | ebd9e3b1f874b5d6b062914947a3de9954862066 (patch) | |
tree | 14ba5b2db92e9e9b88c524cd641545fff9fdfdcf /tests | |
parent | 265f2b75b86337287880290593b3c411ad5fa7a1 (diff) | |
parent | dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 (diff) | |
download | qtlocation-ebd9e3b1f874b5d6b062914947a3de9954862066.tar.gz |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia0a66c229f249532e70b1548f5e618e4db4bc5ad
Diffstat (limited to 'tests')
-rw-r--r-- | tests/applications/positioning_backend/widget.cpp | 13 | ||||
-rw-r--r-- | tests/applications/positioning_backend/widget.h | 1 | ||||
-rw-r--r-- | tests/applications/positioning_backend/widget.ui | 23 |
3 files changed, 28 insertions, 9 deletions
diff --git a/tests/applications/positioning_backend/widget.cpp b/tests/applications/positioning_backend/widget.cpp index efdaebdd..3244c478 100644 --- a/tests/applications/positioning_backend/widget.cpp +++ b/tests/applications/positioning_backend/widget.cpp @@ -102,7 +102,9 @@ void Widget::positionTimedOut() void Widget::errorChanged(QGeoPositionInfoSource::Error err) { - ui->labelErrorState->setText(err == 3 ? QStringLiteral("OK") : QString::number(err)); + ui->labelErrorState->setText(QString::number(err)); + m_posSource->stopUpdates(); + ui->checkBox->setChecked(false); } Widget::~Widget() @@ -126,11 +128,11 @@ void Widget::on_buttonStart_clicked() // Either start or stop the current position info source bool running = ui->checkBox->isChecked(); if (running) { - m_posSource->stopUpdates(); ui->checkBox->setChecked(false); + m_posSource->stopUpdates(); } else { - m_posSource->startUpdates(); ui->checkBox->setChecked(true); + m_posSource->startUpdates(); } } @@ -175,3 +177,8 @@ void Widget::on_buttonUpdateSupported_clicked() ui->labelSupported->setText(text); } + +void Widget::on_buttonResetError_clicked() +{ + ui->labelErrorState->setText(QStringLiteral("N/A")); +} diff --git a/tests/applications/positioning_backend/widget.h b/tests/applications/positioning_backend/widget.h index b67e53b8..e0dc68fc 100644 --- a/tests/applications/positioning_backend/widget.h +++ b/tests/applications/positioning_backend/widget.h @@ -59,6 +59,7 @@ private slots: void on_radioButton_4_clicked(); void on_buttonUpdateSupported_clicked(); + void on_buttonResetError_clicked(); private: LogWidget *log = nullptr; diff --git a/tests/applications/positioning_backend/widget.ui b/tests/applications/positioning_backend/widget.ui index a96a83f6..9cb1566d 100644 --- a/tests/applications/positioning_backend/widget.ui +++ b/tests/applications/positioning_backend/widget.ui @@ -135,11 +135,22 @@ </widget> </item> <item row="11" column="1"> - <widget class="QLabel" name="labelErrorState"> - <property name="text"> - <string>N/A</string> - </property> - </widget> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="labelErrorState"> + <property name="text"> + <string>N/A</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="buttonResetError"> + <property name="text"> + <string>Reset</string> + </property> + </widget> + </item> + </layout> </item> <item row="10" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_3"> @@ -199,7 +210,7 @@ <rect> <x>43</x> <y>21</y> - <width>251</width> + <width>254</width> <height>71</height> </rect> </property> |