diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:07:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-01 03:07:45 +0100 |
| commit | e2b0d7541c1aa3c296cc912f1b0364555b7990c9 (patch) | |
| tree | 9e74d8cfb366e1830c1a69716128c9df9d49da87 /tests | |
| parent | 2aac6b3f26690b4d1be94be8f2b556794b022301 (diff) | |
| parent | 4ee08b0770dc018e390051a35092264f0b1a789a (diff) | |
| download | qtlocation-e2b0d7541c1aa3c296cc912f1b0364555b7990c9.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I453207cbd09ee4901def858193f33d8cef80a2dc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/nokia_services/routing/tst_routing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index 833c95af..ff3fd6ac 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -102,8 +102,8 @@ void MockGeoNetworkReply::setFile(QFile* file) void MockGeoNetworkReply::complete() { - if (error() != QNetworkReply::NoError) - emit error(error()); + if (networkError() != QNetworkReply::NoError) + emit error(networkError()); setFinished(true); emit finished(); } |