diff options
| -rw-r--r-- | src/location/maps/qgeorouterequest.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp index c279b375..89d32f77 100644 --- a/src/location/maps/qgeorouterequest.cpp +++ b/src/location/maps/qgeorouterequest.cpp @@ -318,13 +318,14 @@ QList<QGeoRectangle> QGeoRouteRequest::excludeAreas() const } /*! - Sets the number of alternative routes to request to \a alternatives. + Sets the number of alternative routes to request to \a alternatives. If \a alternatives is + negative the number of alternative routes is set to 0. The default value is 0. */ void QGeoRouteRequest::setNumberAlternativeRoutes(int alternatives) { - d_ptr->numberAlternativeRoutes = alternatives; + d_ptr->numberAlternativeRoutes = qMax(0, alternatives); } /*! diff --git a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp index 7cfd3ff0..bb40fb02 100644 --- a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp +++ b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp @@ -170,7 +170,6 @@ void tst_QGeoRouteRequest::numberAlternativeRoutes() qgeorouterequest->setNumberAlternativeRoutes(-12); - QEXPECT_FAIL("", "numberAlternativeRoutes accepts -ve values", Continue); QCOMPARE(qgeorouterequest->numberAlternativeRoutes(), 0); } |