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

Change-Id: I46ebc392ac3f5da89bc9957113247dd18d682fc1

2 files changed, 3 insertions, 3 deletions

diff --git a/src/location/declarativeplaces/qdeclarativeplace.cpp b/src/location/declarativeplaces/qdeclarativeplace.cpp
index d10d5942..74a8f0c0 100644
--- a/src/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/location/declarativeplaces/qdeclarativeplace.cpp
@@ -1060,8 +1060,8 @@ void QDeclarativePlace::copyFrom(QDeclarativePlace *original)
     \qmlmethod void Place::initializeFavorite(Plugin destinationPlugin)
 
     Creates a favorite instance for the place which is to be saved into the
-    \a destination plugin.  This method does nothing if the favorite property is
-    not null.
+    destination plugin \a destinationPlugin. This method does nothing if the
+    favorite property is not \c null.
 */
 void QDeclarativePlace::initializeFavorite(QDeclarativeGeoServiceProvider *plugin)
 {
diff --git a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
index 0d456f74..67fdc49e 100644
--- a/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
+++ b/src/location/declarativeplaces/qdeclarativesearchmodelbase.cpp
@@ -112,7 +112,7 @@ void QDeclarativeSearchModelBase::setSearchArea(const QVariant &searchArea)
         s = searchArea.value<QGeoCircle>();
     else if (searchArea.userType() == qMetaTypeId<QGeoShape>())
         s = searchArea.value<QGeoShape>();
-    else if (searchArea.type() == qMetaTypeId<QObject *>()) {
+    else if (int(searchArea.type()) == qMetaTypeId<QObject *>()) {
         route = searchArea.value<QDeclarativeGeoRoute *>();
         if (!route)
             return;