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

 Conflicts:
	.qmake.conf

Change-Id: I00453b819d65460dabf771617e6181275461cc78

2 files changed, 9 insertions, 8 deletions

diff --git a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
index a79af1cb..b2f2f043 100644
--- a/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp
@@ -188,19 +188,18 @@ void QPlaceSearchReplyMapbox::onReplyFinished()
 
         if (!categories.isEmpty()) {
             const QList<QPlaceCategory> placeCategories = placeResult.place().categories();
+            bool categoryMatch = false;
             if (!placeCategories.isEmpty()) {
-                bool categoryMatch = false;
                 for (const QPlaceCategory &placeCategory : placeCategories) {
                     if (categories.contains(placeCategory)) {
                         categoryMatch = true;
                         break;
                     }
                 }
-                if (!categoryMatch)
-                    continue;
             }
+            if (!categoryMatch)
+                continue;
         }
-
         placeResult.setDistance(searchCenter.distanceTo(placeResult.place().location().coordinate()));
         results.append(placeResult);
     }
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index ab575463..5094b72e 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -52,6 +52,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
+#include <QtCore/QRegularExpression>
 #include <QtCore/QStandardPaths>
 #include <QtCore/QUrlQuery>
 #include <QtNetwork/QNetworkProxy>
@@ -690,13 +691,14 @@ QPlaceIcon QPlaceManagerEngineNokiaV2::icon(const QString &remotePath,
     QPlaceIcon icon;
     QVariantMap params;
 
-    QRegExp rx("(.*)(/icons/categories/.*)");
+    QRegularExpression rx("(.*)(/icons/categories/.*)");
+    QRegularExpressionMatch match = rx.match(remotePath);
 
     QString iconPrefix;
     QString nokiaIcon;
-    if (rx.indexIn(remotePath) != -1 && !rx.cap(1).isEmpty() && !rx.cap(2).isEmpty()) {
-            iconPrefix = rx.cap(1);
-            nokiaIcon = rx.cap(2);
+    if (match.hasMatch() && !match.capturedRef(1).isEmpty() && !match.capturedRef(2).isEmpty()) {
+            iconPrefix = match.captured(1);
+            nokiaIcon = match.captured(2);
 
         if (QFile::exists(m_localDataPath + nokiaIcon))
             iconPrefix = QString::fromLatin1("file://") + m_localDataPath;