Merge remote-tracking branch 'gerrit/5.4' into dev

Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3

2 files changed, 3 insertions, 3 deletions

diff --git a/src/imports/positioning/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp
index 04b42cbc..ee971c01 100644
--- a/src/imports/positioning/qdeclarativeposition.cpp
+++ b/src/imports/positioning/qdeclarativeposition.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
     \section2 Example Usage
 
     See the example given for the \l{PositionSource} type, or the
-    \l{flickr}{Flickr} example application.
+    \l{geoflickr}{GeoFlickr} example application.
 
     \sa PositionSource, coordinate
 */
diff --git a/src/imports/positioning/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp
index a770e664..f42518f3 100644
--- a/src/imports/positioning/qdeclarativepositionsource.cpp
+++ b/src/imports/positioning/qdeclarativepositionsource.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     }
     \endcode
 
-    The \l{flickr}{Flickr} example application shows how to use
+    The \l{geoflickr}{GeoFlickr} example application shows how to use
     a PositionSource in your application to retrieve local data for users
     from a REST web service.
 
@@ -243,7 +243,7 @@ void QDeclarativePositionSource::setNmeaSource(const QUrl &nmeaSource)
             } else if (localFileName.startsWith("qrc:/")) {
                 localFileName.remove(0, 5);
             }
-            if (!QFile::exists(localFileName) && localFileName.startsWith("/")) {
+            if (!QFile::exists(localFileName) && localFileName.startsWith('/')) {
                 localFileName.remove(0,1);
             }
         }