diff options
| author | Aaron McCarthy <aaron.mccarthy@jollamobile.com> | 2014-01-06 13:44:16 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 09:24:21 +0100 |
| commit | 5e8e9451d1f6c94d0242f60a48e4f154403f6ac1 (patch) | |
| tree | 73dc6006e921246d214f4f52efa83b31efdfd695 /tests/auto/qgeoroutingmanager | |
| parent | 28e6a10ca23df2f4dd5aee73c902e0bfbec2f6d6 (diff) | |
| download | qtlocation-5e8e9451d1f6c94d0242f60a48e4f154403f6ac1.tar.gz | |
Enhance measurement system support in routing manager.
It is useful to be able to set the measurement system independently of
the locale used by the routing manager. Add accessor functions for the
measurement system to the routing manager classes.
Locale and measurement system properties are also added to the
RouteModel QML type.
Change-Id: I8ee9fbdb5ab94615fef7019914b0f104aebfa9c8
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'tests/auto/qgeoroutingmanager')
| -rw-r--r-- | tests/auto/qgeoroutingmanager/tst_qgeoroutingmanager.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/auto/qgeoroutingmanager/tst_qgeoroutingmanager.cpp b/tests/auto/qgeoroutingmanager/tst_qgeoroutingmanager.cpp index cfff7bd2..f8315348 100644 --- a/tests/auto/qgeoroutingmanager/tst_qgeoroutingmanager.cpp +++ b/tests/auto/qgeoroutingmanager/tst_qgeoroutingmanager.cpp @@ -104,17 +104,21 @@ void tst_QGeoRoutingManager::supports() void tst_QGeoRoutingManager::locale() { - QLocale *german = new QLocale(QLocale::German, QLocale::Germany); - QLocale *english = new QLocale(QLocale::C, QLocale::AnyCountry); + QLocale german = QLocale(QLocale::German, QLocale::Germany); + QLocale english = QLocale(QLocale::C, QLocale::AnyCountry); - qgeoroutingmanager->setLocale(*german); + qgeoroutingmanager->setLocale(german); - QCOMPARE(qgeoroutingmanager->locale(), *german); + QCOMPARE(qgeoroutingmanager->locale(), german); - QVERIFY(qgeoroutingmanager->locale() != *english); + QVERIFY(qgeoroutingmanager->locale() != english); - delete german; - delete english; + QLocale en_UK = QLocale(QLocale::English, QLocale::UnitedKingdom); + qgeoroutingmanager->setLocale(en_UK); + QCOMPARE(qgeoroutingmanager->measurementSystem(), en_UK.measurementSystem()); + qgeoroutingmanager->setMeasurementSystem(QLocale::MetricSystem); + QCOMPARE(qgeoroutingmanager->measurementSystem(), QLocale::MetricSystem); + QVERIFY(qgeoroutingmanager->locale().measurementSystem() != qgeoroutingmanager->measurementSystem()); } void tst_QGeoRoutingManager::name() |