diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:09:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:09:03 +0200 |
| commit | 5406993e597cc0747993388486331539222f190c (patch) | |
| tree | 052e4d4b26fec811704b650e83ee8519cdd46e25 /tests | |
| parent | f5c6e2690a749cd1e33b49a1cb57ebfa94996da3 (diff) | |
| parent | 41a066b709d26edb19388a862c15611e749ae71f (diff) | |
| download | qtlocation-5406993e597cc0747993388486331539222f190c.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
Change-Id: Iae1f27979ba8fbb28d8bdf737d63904e75c1f4d1
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_core/tst_geocoding.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative_core/tst_geocoding.qml b/tests/auto/declarative_core/tst_geocoding.qml index c2816c58..eb90f61c 100644 --- a/tests/auto/declarative_core/tst_geocoding.qml +++ b/tests/auto/declarative_core/tst_geocoding.qml @@ -144,7 +144,7 @@ Item { compare(emptyModel.bounds.center.latitude, dynamicCircle.center.latitude) // status - compare (emptyModel.status, RouteModel.Null) + compare (emptyModel.status, GeocodeModel.Null) // error compare (emptyModel.errorString, "") @@ -329,7 +329,7 @@ Item { immediateModel.query = errorAddress1 immediateModel.update() compare (immediateModel.errorString, errorAddress1.street) - compare (immediateModel.error, RouteModel.CommunicationError) + compare (immediateModel.error, GeocodeModel.CommunicationError) compare (immediateModel.count, 0) compare (statusImmediateSpy.count, 2) compare (immediateModel.status, GeocodeModel.Error) |