Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I219444e81a9b304b11b0cecce84415acdb3ade57

2 files changed, 15 insertions, 5 deletions

diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc
index f0094ff0..7c30ef07 100644
--- a/src/positioning/doc/src/qtpositioning.qdoc
+++ b/src/positioning/doc/src/qtpositioning.qdoc
@@ -40,12 +40,15 @@
     For C++ projects include the header appropriate for the current use case,
     for example applications using routes may use
 
-    \code #include <QGeoCoordinate> \endcode
+    \code
+    #include <QGeoCoordinate>
+    \endcode
 
     The .pro file should have the \e positioning keyword added
 
-    \code QT += positioning \endcode
-
+    \badcode
+    QT += positioning
+    \endcode
 
     See more in the \l{Qt Positioning}{Qt Positioning Overview}.
 
@@ -87,11 +90,15 @@ To load the Qt Positioning module, add the following statement to your .qml file
 For C++ projects include the header appropriate for the current use case,
 for example applications using routes may use
 
-\code #include <QGeoCoordinate> \endcode
+\code
+#include <QGeoCoordinate>
+\endcode
 
 The .pro file should have the \e positioning keyword added
 
-\code QT += positioning \endcode
+\badcode
+QT += positioning
+\endcode
 
 \section1 Licenses
 
diff --git a/src/positioning/qgeopath.cpp b/src/positioning/qgeopath.cpp
index 35d82b5f..beb43692 100644
--- a/src/positioning/qgeopath.cpp
+++ b/src/positioning/qgeopath.cpp
@@ -483,6 +483,9 @@ void QGeoPathPrivate::setWidth(const qreal &width)
 
 double QGeoPathPrivate::length(int indexFrom, int indexTo) const
 {
+    if (path().isEmpty())
+        return 0.0;
+
     bool wrap = indexTo == -1;
     if (indexTo < 0 || indexTo >= path().size())
         indexTo = path().size() - 1;