Replace dependency to QtScript with use of QJSValue/QJSEngine

Change-Id: I0d355a8e3d500fce4f1178b8ea31f84b594670c4
Reviewed-by: abcd <amos.choy@nokia.com>

17 files changed, 233 insertions, 231 deletions

diff --git a/src/plugins/geoservices/nokia/places/places.pri b/src/plugins/geoservices/nokia/places/places.pri
index 8c3ee909..b5021d08 100644
--- a/src/plugins/geoservices/nokia/places/places.pri
+++ b/src/plugins/geoservices/nokia/places/places.pri
@@ -1,4 +1,4 @@
-QT *= location network script
+QT *= location network declarative
 
 HEADERS += \
 #data classes
diff --git a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp
index cb3d5dbb..c3c823f7 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.cpp
@@ -48,9 +48,9 @@
 
 #include "qplacejsoncategoriesparser.h"
 
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 
 #if defined(QT_PLACES_LOGGING)
     #include <QDebug>
@@ -88,7 +88,7 @@ QList<QPlaceCategory> QPlaceJSonCategoriesParser::resultCategoriesFlat() const
     return result;
 }
 
-QList<QPlaceCategory> QPlaceJSonCategoriesParser::parseFlatCategoryList(const QScriptValue &categories)
+QList<QPlaceCategory> QPlaceJSonCategoriesParser::parseFlatCategoryList(const QJSValue &categories)
 {
     QPlaceCategoryTree tree;
     PlaceCategoryNode rootNode;
@@ -101,14 +101,14 @@ QList<QPlaceCategory> QPlaceJSonCategoriesParser::parseFlatCategoryList(const QS
     return result;
 }
 
-void QPlaceJSonCategoriesParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonCategoriesParser::processJSonData(const QJSValue &sv)
 {
     m_tree.clear();
     PlaceCategoryNode rootNode;
     m_tree.insert(QString(), rootNode);
 
     if (sv.isValid()) {
-        QScriptValue sv2 = sv.property(place_categories_element);
+        QJSValue sv2 = sv.property(place_categories_element);
         if (sv2.isValid()) {
             processCategories(sv2, QString(), &m_tree);
             emit finished(NoError, QString());
@@ -120,15 +120,15 @@ void QPlaceJSonCategoriesParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonCategoriesParser::processCategories(const QScriptValue &categories, const QString &parentId, QPlaceCategoryTree *tree)
+void QPlaceJSonCategoriesParser::processCategories(const QJSValue &categories, const QString &parentId, QPlaceCategoryTree *tree)
 {
 
     Q_ASSERT(tree->contains(parentId));
 
-    QScriptValue value = categories.property(place_category_element);
+    QJSValue value = categories.property(place_category_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -155,7 +155,7 @@ void QPlaceJSonCategoriesParser::processCategories(const QScriptValue &categorie
     value = categories.property(place_group_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -168,11 +168,11 @@ void QPlaceJSonCategoriesParser::processCategories(const QScriptValue &categorie
     }
 }
 
-PlaceCategoryNode QPlaceJSonCategoriesParser::processCategory(const QScriptValue &categoryValue, const QString &parentId)
+PlaceCategoryNode QPlaceJSonCategoriesParser::processCategory(const QJSValue &categoryValue, const QString &parentId)
 {
     PlaceCategoryNode categoryNode;
     categoryNode.parentId = parentId;
-    QScriptValue value = categoryValue.property(place_category_id_element);
+    QJSValue value = categoryValue.property(place_category_id_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         categoryNode.category.setCategoryId(value.toString());
         value = categoryValue.property(place_category_name_element);
@@ -183,9 +183,9 @@ PlaceCategoryNode QPlaceJSonCategoriesParser::processCategory(const QScriptValue
     return categoryNode;
 }
 
-void QPlaceJSonCategoriesParser::processGroup(const QScriptValue &group, const QString &parentId, QPlaceCategoryTree *tree)
+void QPlaceJSonCategoriesParser::processGroup(const QJSValue &group, const QString &parentId, QPlaceCategoryTree *tree)
 {
-    QScriptValue value = group.property(place_groupingcategory_element);
+    QJSValue value = group.property(place_groupingcategory_element);
     if (!value.isValid())
         return;
 
diff --git a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.h b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.h
index 5c02d875..8b1a9117 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsoncategoriesparser.h
@@ -56,8 +56,8 @@
 #include <qplacecategory.h>
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 
 QT_BEGIN_NAMESPACE
 
@@ -82,14 +82,14 @@ public:
     QPlaceCategoryTree resultCategories() const;
     QList<QPlaceCategory> resultCategoriesFlat() const;
 
-    static QList<QPlaceCategory> parseFlatCategoryList(const QScriptValue &categories);
+    static QList<QPlaceCategory> parseFlatCategoryList(const QJSValue &categories);
 
 private:
-    void processJSonData(const QScriptValue &sv);
+    void processJSonData(const QJSValue &sv);
 
-    static void processCategories(const QScriptValue &categories, const QString &parentId, QPlaceCategoryTree *tree);
-    static void processGroup(const QScriptValue &group, const QString &parentId, QPlaceCategoryTree *tree);
-    static PlaceCategoryNode processCategory(const QScriptValue &categoryValue, const QString &parentId);
+    static void processCategories(const QJSValue &categories, const QString &parentId, QPlaceCategoryTree *tree);
+    static void processGroup(const QJSValue &group, const QString &parentId, QPlaceCategoryTree *tree);
+    static PlaceCategoryNode processCategory(const QJSValue &categoryValue, const QString &parentId);
 
 private:
     QPlaceCategoryTree m_tree;
diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
index 7fe8ff2e..9320deaa 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
@@ -50,9 +50,9 @@
 
 #include <QtCore/QUrl>
 #include <QtCore/QTime>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 #include <QtLocation/QPlaceContactDetail>
 
 #include <qgeoaddress.h>
@@ -195,7 +195,7 @@ QPlaceJSonDetailsParser::~QPlaceJSonDetailsParser()
 {
 }
 
-QPlace QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QPlaceManager *manager)
+QPlace QPlaceJSonDetailsParser::buildPlace(const QJSValue &placeValue, QPlaceManager *manager)
 {
     QPlace newPlace;
     if (placeValue.isValid()) {
@@ -216,10 +216,10 @@ QPlace QPlaceJSonDetailsParser::result()
     return place;
 }
 
-void QPlaceJSonDetailsParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonDetailsParser::processJSonData(const QJSValue &sv)
 {
     if (sv.isValid()) {
-        QScriptValue placeProperty = sv.property(place_place_element);
+        QJSValue placeProperty = sv.property(place_place_element);
         if (placeProperty.isValid()) {
             place = buildPlace(placeProperty, m_manager);
             emit finished(NoError, QString());
@@ -231,10 +231,10 @@ void QPlaceJSonDetailsParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::buildPlace(const QJSValue &placeValue, QPlace *targetPlace)
 {
     if (placeValue.isValid()) {
-        QScriptValue value = placeValue.property(place_id_element);
+        QJSValue value = placeValue.property(place_id_element);
         if (value.isValid() && !value.toString().isEmpty()) {
             targetPlace->setPlaceId(value.toString());
         }
@@ -274,10 +274,10 @@ void QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QPlace
     }
 }
 
-void QPlaceJSonDetailsParser::processMainProvider(const QScriptValue &placeValue, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processMainProvider(const QJSValue &placeValue, QPlace *targetPlace)
 {
     QPlaceSupplier sup;
-    QScriptValue value = placeValue.property(place_provider);
+    QJSValue value = placeValue.property(place_provider);
     if (value.isValid() && !value.toString().isEmpty()) {
         sup.setName(value.toString());
     }
@@ -295,9 +295,9 @@ void QPlaceJSonDetailsParser::processMainProvider(const QScriptValue &placeValue
     targetPlace->setSupplier(QPlaceSuppliersRepository::instance()->addSupplier(sup));
 }
 
-void QPlaceJSonDetailsParser::processContacts(const QScriptValue &contactsValue, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processContacts(const QJSValue &contactsValue, QPlace *targetPlace)
 {
-    QScriptValueIterator it(contactsValue);
+    QJSValueIterator it(contactsValue);
     QPlaceContactDetail contactDetail;
     while (it.hasNext()) {
         it.next();
@@ -323,18 +323,18 @@ void QPlaceJSonDetailsParser::processContacts(const QScriptValue &contactsValue,
     }
 }
 
-void QPlaceJSonDetailsParser::processCategories(const QScriptValue &categories, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processCategories(const QJSValue &categories, QPlace *targetPlace)
 {
     targetPlace->setCategories(QPlaceJSonCategoriesParser::parseFlatCategoryList(categories));
 }
 
-void QPlaceJSonDetailsParser::processRatings(const QScriptValue &ratings, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processRatings(const QJSValue &ratings, QPlace *targetPlace)
 {
     QPlaceRating *rating = NULL;
-    QScriptValue value = ratings.property(place_rating_element);
+    QJSValue value = ratings.property(place_rating_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -356,10 +356,10 @@ void QPlaceJSonDetailsParser::processRatings(const QScriptValue &ratings, QPlace
     }
 }
 
-QPlaceRating *QPlaceJSonDetailsParser::processRating(const QScriptValue &ratingElement)
+QPlaceRating *QPlaceJSonDetailsParser::processRating(const QJSValue &ratingElement)
 {
     QPlaceRating *rating = NULL;
-    QScriptValue value = ratingElement.property(place_rating_type_element);
+    QJSValue value = ratingElement.property(place_rating_type_element);
     // Only overall elements are interesting
     if (value.isValid() && value.toString() == place_rating_type_overall_element) {
         rating = new QPlaceRating();
@@ -383,10 +383,10 @@ QPlaceRating *QPlaceJSonDetailsParser::processRating(const QScriptValue &ratingE
     return rating;
 }
 
-void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QGeoLocation *location)
+void QPlaceJSonDetailsParser::processAddress(const QJSValue &address, QGeoLocation *location)
 {
     QGeoAddress newAddress;
-    QScriptValue value = address.property(place_address_street);
+    QJSValue value = address.property(place_address_street);
     if (value.isValid() && !value.toString().isEmpty()) {
         newAddress.setStreet(value.toString());
     }
@@ -425,13 +425,13 @@ void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QGeoLo
     location->setAddress(newAddress);
 }
 
-void QPlaceJSonDetailsParser::processLocation(const QScriptValue &location, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processLocation(const QJSValue &location, QPlace *targetPlace)
 {
     QGeoLocation newLocation;
-    QScriptValue property = location.property(place_geoCoordinates_element);
+    QJSValue property = location.property(place_geoCoordinates_element);
     if (property.isValid()) {
         QGeoCoordinate pos;
-        QScriptValue value = property.property(place_geoCoordinates_longitude_value);
+        QJSValue value = property.property(place_geoCoordinates_longitude_value);
         if (value.isValid() && !value.toString().isEmpty()) {
             bool isConverted;
             double longitude = value.toString().toDouble(&isConverted);
@@ -456,21 +456,21 @@ void QPlaceJSonDetailsParser::processLocation(const QScriptValue &location, QPla
     targetPlace->setLocation(newLocation);
 }
 
-void QPlaceJSonDetailsParser::processTags(const QScriptValue &tags, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processTags(const QJSValue &tags, QPlace *targetPlace)
 {
     QStringList newTags;
     if (tags.isValid()) {
         if (tags.isArray()) {
-            QScriptValueIterator it(tags);
+            QJSValueIterator it(tags);
             while (it.hasNext()) {
                 it.next();
-                QScriptValue value = it.value().property(place_tags_value_element);
+                QJSValue value = it.value().property(place_tags_value_element);
                 if (value.isValid() && !value.toString().isEmpty()) {
                     newTags.append(value.toString());
                 }
             }
         } else {
-            QScriptValue value = tags.property(place_tags_value_element);
+            QJSValue value = tags.property(place_tags_value_element);
             if (value.isValid() && !value.toString().isEmpty()) {
                 newTags.append(value.toString());
             }
@@ -481,15 +481,15 @@ void QPlaceJSonDetailsParser::processTags(const QScriptValue &tags, QPlace *targ
     // parse and skip assignment.
 }
 
-void QPlaceJSonDetailsParser::processNames(const QScriptValue &names, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processNames(const QJSValue &names, QPlace *targetPlace)
 {
-    QScriptValue value = names.property(place_alternativenames_element);
+    QJSValue value = names.property(place_alternativenames_element);
     if (value.isValid()) {
         value = value.property(place_name_localized_element);
         if (value.isValid()) {
             QStringList list;
             if (value.isArray()) {
-                QScriptValueIterator it(value);
+                QJSValueIterator it(value);
                 while (it.hasNext()) {
                     it.next();
                     // array contains count as last element
@@ -521,22 +521,22 @@ void QPlaceJSonDetailsParser::processNames(const QScriptValue &names, QPlace *ta
     }
 }
 
-QString QPlaceJSonDetailsParser::processName(const QScriptValue &nameValue)
+QString QPlaceJSonDetailsParser::processName(const QJSValue &nameValue)
 {
     QString name;
-    QScriptValue value = nameValue.property(place_name_value_element);
+    QJSValue value = nameValue.property(place_name_value_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         name = value.toString();
     }
     return name;
 }
 
-void QPlaceJSonDetailsParser::processPremiumContents(const QScriptValue &premiumContent, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processPremiumContents(const QJSValue &premiumContent, QPlace *targetPlace)
 {
-    QScriptValue value = premiumContent.property(place_premiumcontent_version_element);
+    QJSValue value = premiumContent.property(place_premiumcontent_version_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -550,12 +550,12 @@ void QPlaceJSonDetailsParser::processPremiumContents(const QScriptValue &premium
     }
 }
 
-void QPlaceJSonDetailsParser::processPremiumVersion(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processPremiumVersion(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_premiumcontent_content_element);
+    QJSValue value = content.property(place_premiumcontent_content_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -569,10 +569,10 @@ void QPlaceJSonDetailsParser::processPremiumVersion(const QScriptValue &content,
     }
 }
 
-void QPlaceJSonDetailsParser::processPremiumContent(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processPremiumContent(const QJSValue &content, QPlace *targetPlace)
 {
     QString name, id, iconUrl;
-    QScriptValue value = content.property(place_premiumcontent_content_providername_element);
+    QJSValue value = content.property(place_premiumcontent_content_providername_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         name = value.toString();
     }
@@ -601,11 +601,11 @@ void QPlaceJSonDetailsParser::processPremiumContent(const QScriptValue &content,
     processPremiumContentMediaObjects(content, supplier, targetPlace);
 }
 
-void QPlaceJSonDetailsParser::processPremiumContentDescription(const QScriptValue &content,
+void QPlaceJSonDetailsParser::processPremiumContentDescription(const QJSValue &content,
                                                                const QPlaceSupplier &supplier,
                                                                QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_premiumcontent_content_desc_element);
+    QJSValue value = content.property(place_premiumcontent_content_desc_element);
     QPlaceEditorial desc;
     if (value.isValid() && !value.toString().isEmpty()) {
         desc.setText(value.toString());
@@ -645,14 +645,14 @@ void QPlaceJSonDetailsParser::processPremiumContentDescription(const QScriptValu
     targetPlace->setContent(QPlaceContent::EditorialType, editorials);
 }
 
-void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QScriptValue &content,
+void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QJSValue &content,
                                                                 const QPlaceSupplier &supplier,
                                                                 QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_premiumcontent_content_media_element);
+    QJSValue value = content.property(place_premiumcontent_content_media_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             //Note: Currently only image types are supported by the server
             QPlaceContent::Collection images = targetPlace->content(QPlaceContent::ImageType);
             int insertionIndex = 0;
@@ -689,10 +689,10 @@ void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QScriptVal
     }
 }
 
-QPlaceImage *QPlaceJSonDetailsParser::processPremiumContentMediaObject(const QScriptValue &content)
+QPlaceImage *QPlaceJSonDetailsParser::processPremiumContentMediaObject(const QJSValue &content)
 {
     QPlaceImage *obj = NULL;
-    QScriptValue value = content.property(place_premiumcontent_content_mediaurl_element);
+    QJSValue value = content.property(place_premiumcontent_content_mediaurl_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         obj = new QPlaceImage();
         obj->setUrl(QUrl::fromEncoded(value.toString().toAscii()));
@@ -705,9 +705,9 @@ QPlaceImage *QPlaceJSonDetailsParser::processPremiumContentMediaObject(const QSc
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContent(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContent(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_descriptions_element);
+    QJSValue value = content.property(place_adcontent_descriptions_element);
     if (value.isValid()) {
         processAdContentDescriptions(value, targetPlace);
     }
@@ -725,12 +725,12 @@ void QPlaceJSonDetailsParser::processAdContent(const QScriptValue &content, QPla
     }
 }
 
-void QPlaceJSonDetailsParser::processAdContentDescriptions(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContentDescriptions(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_description_element);
+    QJSValue value = content.property(place_adcontent_description_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
 
             QPlaceContent::Collection editorials =
                 targetPlace->content(QPlaceContent::EditorialType);
@@ -770,10 +770,10 @@ void QPlaceJSonDetailsParser::processAdContentDescriptions(const QScriptValue &c
     }
 }
 
-QPlaceEditorial *QPlaceJSonDetailsParser::processAdContentDescription(const QScriptValue &content)
+QPlaceEditorial *QPlaceJSonDetailsParser::processAdContentDescription(const QJSValue &content)
 {
     QPlaceEditorial *description = NULL;
-    QScriptValue value = content.property(place_adcontent_localizedDescription_element);
+    QJSValue value = content.property(place_adcontent_localizedDescription_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         description = new QPlaceEditorial();
         description->setText(value.toString());
@@ -785,12 +785,12 @@ QPlaceEditorial *QPlaceJSonDetailsParser::processAdContentDescription(const QScr
     return description;
 }
 
-void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_media_element);
+    QJSValue value = content.property(place_adcontent_media_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             //The server only has images for now.
             QPlaceContent::Collection images =targetPlace->content(QPlaceContent::ImageType);
             int insertionIndex = 0;
@@ -825,13 +825,13 @@ void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QScriptValue &c
     }
 }
 
-QPlaceImage *QPlaceJSonDetailsParser::processAdContentMediaObject(const QScriptValue &content)
+QPlaceImage *QPlaceJSonDetailsParser::processAdContentMediaObject(const QJSValue &content)
 {
     QPlaceImage *obj = NULL;
     QString mediaMimeType;
     QString mediaUrl;
 
-    QScriptValue value = content.property(place_adcontent_media_mime_element);
+    QJSValue value = content.property(place_adcontent_media_mime_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         mediaMimeType = value.toString();
     }
@@ -848,13 +848,13 @@ QPlaceImage *QPlaceJSonDetailsParser::processAdContentMediaObject(const QScriptV
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContentPaymentMethods(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContentPaymentMethods(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_paymentmethod_element);
+    QJSValue value = content.property(place_adcontent_paymentmethod_element);
     if (value.isValid()) {
         QStringList list;
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -880,19 +880,19 @@ void QPlaceJSonDetailsParser::processAdContentPaymentMethods(const QScriptValue
     }
 }
 
-QString QPlaceJSonDetailsParser::processAdContentPaymentMethod(const QScriptValue &content)
+QString QPlaceJSonDetailsParser::processAdContentPaymentMethod(const QJSValue &content)
 {
     QString obj;
-    QScriptValue value = content.property(place_adcontent_paymentmethod_name_element);
+    QJSValue value = content.property(place_adcontent_paymentmethod_name_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         obj = value.toString();
     }
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_hours_annualclosingsnotes_element);
+    QJSValue value = content.property(place_adcontent_hours_annualclosingsnotes_element);
     if (value.isValid()) {
         processAdContentClosingsNotes(value, targetPlace);
     }
@@ -906,15 +906,15 @@ void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue &
     }
 }
 
-void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QScriptValue &content,
+void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QJSValue &content,
                                                             QPlace *targetPlace)
 {
     Q_UNUSED(targetPlace)
 
-    QScriptValue value = content.property(place_adcontent_hours_annualclosingsnote_element);
+    QJSValue value = content.property(place_adcontent_hours_annualclosingsnote_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -941,25 +941,25 @@ void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QScriptValue &
     }
 }
 
-QString QPlaceJSonDetailsParser::processAdContentClosingsNote(const QScriptValue &content)
+QString QPlaceJSonDetailsParser::processAdContentClosingsNote(const QJSValue &content)
 {
     QString ret;
-    QScriptValue value = content.property(place_adcontent_hours_annualclosingsnote_v_element);
+    QJSValue value = content.property(place_adcontent_hours_annualclosingsnote_v_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         ret = value.toString();
     }
     return ret;
 }
 
-void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QScriptValue &content,
+void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QJSValue &content,
                                                            QPlace *targetPlace)
 {
     Q_UNUSED(targetPlace)
 
-    QScriptValue value = content.property(place_adcontent_hours_open_hours_element);
+    QJSValue value = content.property(place_adcontent_hours_open_hours_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -981,14 +981,14 @@ void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QScriptValue &c
     }
 }
 
-void QPlaceJSonDetailsParser::processAdContentOpeningHoursElement(const QScriptValue &content)
+void QPlaceJSonDetailsParser::processAdContentOpeningHoursElement(const QJSValue &content)
 {
     //The JSON data specification defines
     //structured opening hour elements
     //but our API doesn't expose this so we
     //parse but do nothing else
 
-    QScriptValue value = content.property(place_adcontent_hours_open_day_element);
+    QJSValue value = content.property(place_adcontent_hours_open_day_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         QString day = value.toString();
         if (place_premiumcontent_content_monday == day) {
@@ -1012,12 +1012,12 @@ void QPlaceJSonDetailsParser::processAdContentOpeningHoursElement(const QScriptV
     return;
 }
 
-void QPlaceJSonDetailsParser::processAdContentOpeningNotes(const QScriptValue &content, QPlace *targetPlace)
+void QPlaceJSonDetailsParser::processAdContentOpeningNotes(const QJSValue &content, QPlace *targetPlace)
 {
-    QScriptValue value = content.property(place_adcontent_hours_openingnote_element);
+    QJSValue value = content.property(place_adcontent_hours_openingnote_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -1045,10 +1045,10 @@ void QPlaceJSonDetailsParser::processAdContentOpeningNotes(const QScriptValue &c
     }
 }
 
-QString QPlaceJSonDetailsParser::processAdContentOpeningNote(const QScriptValue &content)
+QString QPlaceJSonDetailsParser::processAdContentOpeningNote(const QJSValue &content)
 {
     QString ret;
-    QScriptValue value = content.property(place_adcontent_hours_openingnote_v_element);
+    QJSValue value = content.property(place_adcontent_hours_openingnote_v_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         ret = value.toString();
     }
diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
index 6a1c15eb..b504b883 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
@@ -58,8 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 class QPlaceEditorial;
 
 class QPlaceJSonDetailsParser : public QPlaceJSonParser
@@ -69,47 +69,47 @@ public:
     explicit QPlaceJSonDetailsParser(QPlaceManager *manager, QObject *parent = 0);
     virtual ~QPlaceJSonDetailsParser();
 
-    static QPlace buildPlace(const QScriptValue &place, QPlaceManager *manager);
+    static QPlace buildPlace(const QJSValue &place, QPlaceManager *manager);
     QPlace result();
 
 private:
-    void processJSonData(const QScriptValue &sv);
-    static void buildPlace(const QScriptValue &place, QPlace *targetPlace);
-    static void processMainProvider(const QScriptValue &place, QPlace *targetPlace);
-    static void processContacts(const QScriptValue &contacts, QPlace *targetPlace);
-    static void processCategories(const QScriptValue &categories, QPlace *targetPlace);
-    static QPlaceCategory processCategory(const QScriptValue &category);
-    static void processRatings(const QScriptValue &ratings, QPlace *targetPlace);
-    static QPlaceRating *processRating(const QScriptValue &rating);
-    static void processAddress(const QScriptValue &address, QGeoLocation *location);
-    static void processLocation(const QScriptValue &location, QPlace *targetPlace);
-    static void processTags(const QScriptValue &locations, QPlace *targetPlace);
-    static void processNames(const QScriptValue &locations, QPlace *targetPlace);
-    static QString processName(const QScriptValue &nameValue);
-    static void processPremiumContents(const QScriptValue &content, QPlace *targetPlace);
-    static void processPremiumVersion(const QScriptValue &content, QPlace *targetPlace);
-    static void processPremiumContent(const QScriptValue &content, QPlace *targetPlace);
-    static void processPremiumContentDescription(const QScriptValue &content,
+    void processJSonData(const QJSValue &sv);
+    static void buildPlace(const QJSValue &place, QPlace *targetPlace);
+    static void processMainProvider(const QJSValue &place, QPlace *targetPlace);
+    static void processContacts(const QJSValue &contacts, QPlace *targetPlace);
+    static void processCategories(const QJSValue &categories, QPlace *targetPlace);
+    static QPlaceCategory processCategory(const QJSValue &category);
+    static void processRatings(const QJSValue &ratings, QPlace *targetPlace);
+    static QPlaceRating *processRating(const QJSValue &rating);
+    static void processAddress(const QJSValue &address, QGeoLocation *location);
+    static void processLocation(const QJSValue &location, QPlace *targetPlace);
+    static void processTags(const QJSValue &locations, QPlace *targetPlace);
+    static void processNames(const QJSValue &locations, QPlace *targetPlace);
+    static QString processName(const QJSValue &nameValue);
+    static void processPremiumContents(const QJSValue &content, QPlace *targetPlace);
+    static void processPremiumVersion(const QJSValue &content, QPlace *targetPlace);
+    static void processPremiumContent(const QJSValue &content, QPlace *targetPlace);
+    static void processPremiumContentDescription(const QJSValue &content,
                                                  const QPlaceSupplier &supplier,
                                                  QPlace *targetPlace);
-    static void processPremiumContentMediaObjects(const QScriptValue &content,
+    static void processPremiumContentMediaObjects(const QJSValue &content,
                                                   const QPlaceSupplier &supplier,
                                                   QPlace *targetPlace);
-    static QPlaceImage *processPremiumContentMediaObject(const QScriptValue &content);
-    static void processAdContent(const QScriptValue &content, QPlace *targetPlace);
-    static void processAdContentDescriptions(const QScriptValue &content, QPlace *targetPlace);
-    static QPlaceEditorial *processAdContentDescription(const QScriptValue &content);
-    static void processAdContentMediaObjects(const QScriptValue &content, QPlace *targetPlace);
-    static QPlaceImage *processAdContentMediaObject(const QScriptValue &content);
-    static void processAdContentPaymentMethods(const QScriptValue &content, QPlace *targetPlace);
-    static QString processAdContentPaymentMethod(const QScriptValue &content);
-    static void processAdContentBusinessHours(const QScriptValue &content, QPlace *targetPlace);
-    static void processAdContentClosingsNotes(const QScriptValue &content, QPlace *targetPlace);
-    static QString processAdContentClosingsNote(const QScriptValue &content);
-    static void processAdContentOpeningHours(const QScriptValue &content, QPlace *targetPlace);
-    static void processAdContentOpeningHoursElement(const QScriptValue &content);
-    static void processAdContentOpeningNotes(const QScriptValue &content, QPlace *targetPlace);
-    static QString processAdContentOpeningNote(const QScriptValue &content);
+    static QPlaceImage *processPremiumContentMediaObject(const QJSValue &content);
+    static void processAdContent(const QJSValue &content, QPlace *targetPlace);
+    static void processAdContentDescriptions(const QJSValue &content, QPlace *targetPlace);
+    static QPlaceEditorial *processAdContentDescription(const QJSValue &content);
+    static void processAdContentMediaObjects(const QJSValue &content, QPlace *targetPlace);
+    static QPlaceImage *processAdContentMediaObject(const QJSValue &content);
+    static void processAdContentPaymentMethods(const QJSValue &content, QPlace *targetPlace);
+    static QString processAdContentPaymentMethod(const QJSValue &content);
+    static void processAdContentBusinessHours(const QJSValue &content, QPlace *targetPlace);
+    static void processAdContentClosingsNotes(const QJSValue &content, QPlace *targetPlace);
+    static QString processAdContentClosingsNote(const QJSValue &content);
+    static void processAdContentOpeningHours(const QJSValue &content, QPlace *targetPlace);
+    static void processAdContentOpeningHoursElement(const QJSValue &content);
+    static void processAdContentOpeningNotes(const QJSValue &content, QPlace *targetPlace);
+    static QString processAdContentOpeningNote(const QJSValue &content);
 
 private:
     QPlace place;
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.cpp
index d661a080..9b851feb 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.cpp
@@ -49,9 +49,9 @@
 #include "qplacejsonmediaparser.h"
 
 #include <QtCore/QUrl>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 
 #include <qplacesupplier.h>
 #include "qplacesuppliersrepository.h"
@@ -91,10 +91,10 @@ int QPlaceJSonMediaParser::allMediaCount()
     return allMedia;
 }
 
-QPlaceImage QPlaceJSonMediaParser::buildMediaObject(const QScriptValue &media)
+QPlaceImage QPlaceJSonMediaParser::buildMediaObject(const QJSValue &media)
 {
     QPlaceImage newMedia;
-    QScriptValue value = media.property(media_url);
+    QJSValue value = media.property(media_url);
     if (value.isValid() && !value.toString().isEmpty()) {
         newMedia.setUrl(QUrl::fromEncoded(value.toString().toAscii()));
         newMedia.setImageId(value.toString());
@@ -119,12 +119,12 @@ QPlaceImage QPlaceJSonMediaParser::buildMediaObject(const QScriptValue &media)
     return newMedia;
 }
 
-void QPlaceJSonMediaParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonMediaParser::processJSonData(const QJSValue &sv)
 {
     media.clear();
 
     if (sv.isValid()) {
-        QScriptValue sv2 = sv.property(media_objects_element);
+        QJSValue sv2 = sv.property(media_objects_element);
         if (sv2.isValid()) {
             processMedia(sv2);
             emit finished(NoError, QString());
@@ -136,12 +136,12 @@ void QPlaceJSonMediaParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonMediaParser::processMedia(const QScriptValue &mediaElement)
+void QPlaceJSonMediaParser::processMedia(const QJSValue &mediaElement)
 {
-    QScriptValue value = mediaElement.property(media_element);
+    QJSValue value = mediaElement.property(media_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.h b/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.h
index 050fc7d3..416aa4eb 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonmediaparser.h
@@ -55,8 +55,8 @@
 #include <qplaceimage.h>
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 
 QT_BEGIN_NAMESPACE
 
@@ -69,11 +69,11 @@ public:
 
     QList<QPlaceImage> resultMedia();
     int allMediaCount();
-    static QPlaceImage buildMediaObject(const QScriptValue &place);
+    static QPlaceImage buildMediaObject(const QJSValue &place);
 
 private:
-    void processJSonData(const QScriptValue &sv);
-    void processMedia(const QScriptValue &contacts);
+    void processJSonData(const QJSValue &sv);
+    void processMedia(const QJSValue &contacts);
 
 private:
     QList<QPlaceImage> media;
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonparser.cpp
index 8053b393..ca24c5bf 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonparser.cpp
@@ -41,8 +41,8 @@
 
 #include "qplacejsonparser_p.h"
 
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
+#include <QJSEngine>
+#include <QJSValue>
 
 #if defined(QT_PLACES_LOGGING)
     #include <QDebug>
@@ -57,8 +57,8 @@ QPlaceJSonParser::QPlaceJSonParser(QObject *parent) :
 void QPlaceJSonParser::processData(const QString &data)
 {
     if (!engine) {
-        engine = new QScriptEngine(this);
+        engine = new QJSEngine(this);
     }
-    QScriptValue sv = engine->evaluate("(" + data + ")");
+    QJSValue sv = engine->evaluate("(" + data + ")");
     processJSonData(sv);
 }
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonparser_p.h b/src/plugins/geoservices/nokia/places/qplacejsonparser_p.h
index 4756357f..80b9b172 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonparser_p.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonparser_p.h
@@ -44,8 +44,8 @@
 
 #include <QObject>
 #include <QStringList>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
+#include <QJSEngine>
+#include <QJSValue>
 
 class QPlaceJSonParser : public QObject
 {
@@ -65,10 +65,10 @@ public slots:
     void processData(const QString &data);
 
 private:
-    virtual void processJSonData(const QScriptValue &sv) = 0;
+    virtual void processJSonData(const QJSValue &sv) = 0;
 
 protected:
-    QScriptEngine *engine;
+    QJSEngine *engine;
 };
 
 #endif // QPLACEJSONPARSER_P_H
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
index 8973d555..cf96d669 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
@@ -48,9 +48,9 @@
 
 #include "qplacejsonrecommendationparser.h"
 
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 
 #include "qplacejsondetailsparser.h"
 #include <qplace.h>
@@ -80,14 +80,14 @@ QList<QPlaceSearchResult> QPlaceJSonRecommendationParser::results()
     return searchResults;
 }
 
-void QPlaceJSonRecommendationParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonRecommendationParser::processJSonData(const QJSValue &sv)
 {
     searchResults.clear();
 
     if (sv.isValid()) {
-        QScriptValue sv2 = sv.property(recommendations_element);
+        QJSValue sv2 = sv.property(recommendations_element);
         if (sv2.isValid()) {
-            QScriptValueIterator it(sv2.property(recommendations_nearby_element));
+            QJSValueIterator it(sv2.property(recommendations_nearby_element));
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -102,13 +102,13 @@ void QPlaceJSonRecommendationParser::processJSonData(const QScriptValue &sv)
     emit finished(ParsingError, QString("JSON data are invalid"));
 }
 
-void QPlaceJSonRecommendationParser::processResultElement(const QScriptValue &value)
+void QPlaceJSonRecommendationParser::processResultElement(const QJSValue &value)
 {
     QPlaceSearchResult result;
     result.setType(QPlaceSearchResult::PlaceResult);
 
     // Processing properties
-    QScriptValue distance = value.property(recommendations_distance_element);
+    QJSValue distance = value.property(recommendations_distance_element);
     if (distance.isValid() && !distance.toString().isEmpty()) {
         bool isConverted;
         double distanceValue = distance.toString().toDouble(&isConverted);
@@ -116,7 +116,7 @@ void QPlaceJSonRecommendationParser::processResultElement(const QScriptValue &va
             result.setDistance(distanceValue);
         }
     }
-    QScriptValue place = value.property(recommendations_place_element);
+    QJSValue place = value.property(recommendations_place_element);
     if (place.isValid()) {
         QPlace newPlace = QPlaceJSonDetailsParser::buildPlace(place, m_manager);
         result.setPlace(newPlace);
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.h b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.h
index 39c711a3..50cc5420 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.h
@@ -55,8 +55,8 @@
 #include <qplacesearchresult.h>
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 
 QT_BEGIN_NAMESPACE
 
@@ -72,8 +72,8 @@ public:
     QList<QPlaceSearchResult> results();
 
 private:
-    void processJSonData(const QScriptValue &sv);
-    void processResultElement(const QScriptValue &value);
+    void processJSonData(const QJSValue &sv);
+    void processResultElement(const QJSValue &value);
 
 private:
     QList<QPlaceSearchResult> searchResults;
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp
index 773ca01c..985cdc88 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.cpp
@@ -50,9 +50,9 @@
 
 #include <QtCore/QUrl>
 #include <QtCore/QDateTime>
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 #include <QtLocation/QPlaceIcon>
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceUser>
@@ -104,10 +104,10 @@ int QPlaceJSonReviewParser::allReviewsCount()
     return allReviews;
 }
 
-QPlaceReview QPlaceJSonReviewParser::buildReview(const QScriptValue &review, QPlaceManager *manager)
+QPlaceReview QPlaceJSonReviewParser::buildReview(const QJSValue &review, QPlaceManager *manager)
 {
     QPlaceReview newReview;
-    QScriptValue value = review.property(review_id_element);
+    QJSValue value = review.property(review_id_element);
     if (value.isValid() && !value.toString().isEmpty()) {
         newReview.setReviewId(value.toString());
     }
@@ -178,12 +178,12 @@ QPlaceReview QPlaceJSonReviewParser::buildReview(const QScriptValue &review, QPl
     return newReview;
 }
 
-void QPlaceJSonReviewParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonReviewParser::processJSonData(const QJSValue &sv)
 {
     reviews.clear();
 
     if (sv.isValid()) {
-        QScriptValue sv2 = sv.property(reviews_element);
+        QJSValue sv2 = sv.property(reviews_element);
         if (sv2.isValid()) {
             processReviews(sv2);
             emit finished(NoError, QString());
@@ -195,12 +195,12 @@ void QPlaceJSonReviewParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonReviewParser::processReviews(const QScriptValue &reviewsElement)
+void QPlaceJSonReviewParser::processReviews(const QJSValue &reviewsElement)
 {
-    QScriptValue value = reviewsElement.property(review_element);
+    QJSValue value = reviewsElement.property(review_element);
     if (value.isValid()) {
         if (value.isArray()) {
-            QScriptValueIterator it(value);
+            QJSValueIterator it(value);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.h b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.h
index 78991be5..b44be79c 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonreviewparser.h
@@ -55,8 +55,8 @@
 #include <qplacesearchresult.h>
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 
 QT_BEGIN_NAMESPACE
 class QPlaceManager;
@@ -70,11 +70,11 @@ public:
 
     QList<QPlaceReview> results();
     int allReviewsCount();
-    static QPlaceReview buildReview(const QScriptValue &place, QPlaceManager *manager);
+    static QPlaceReview buildReview(const QJSValue &place, QPlaceManager *manager);
 
 private:
-    void processJSonData(const QScriptValue &sv);
-    void processReviews(const QScriptValue &contacts);
+    void processJSonData(const QJSValue &sv);
+    void processReviews(const QJSValue &contacts);
 
 private:
     QList<QPlaceReview> reviews;
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
index 8fac0b10..dbecdb72 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
@@ -48,9 +48,9 @@
 
 #include "qplacejsonsearchparser.h"
 
-#include <QtScript/QScriptEngine>
-#include <QtScript/QScriptValue>
-#include <QtScript/QScriptValueIterator>
+#include <QJSEngine>
+#include <QJSValue>
+#include <QJSValueIterator>
 
 #include <qgeocoordinate.h>
 #include <qgeoaddress.h>
@@ -121,14 +121,14 @@ QList<QPlaceSearchResult> QPlaceJSonSearchParser::searchResults()
     return searchResultsList;
 }
 
-void QPlaceJSonSearchParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonSearchParser::processJSonData(const QJSValue &sv)
 {
     searchResultsList.clear();
 
     if (sv.isValid()) {
-        QScriptValue results = sv.property(search_results_element);
+        QJSValue results = sv.property(search_results_element);
         if (results.isValid()) {
-            QScriptValueIterator it(results);
+            QJSValueIterator it(results);
             while (it.hasNext()) {
                 it.next();
                 // array contains count as last element
@@ -145,17 +145,17 @@ void QPlaceJSonSearchParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonSearchParser::processResultElement(const QScriptValue &value)
+void QPlaceJSonSearchParser::processResultElement(const QJSValue &value)
 {
     // Procesing DYM string
-    QScriptValue type = value.property(search_type_element);
+    QJSValue type = value.property(search_type_element);
     if (type.isValid() && type.toString() == search_type_dym_value) {
-        QScriptValue properties = value.property(search_properties_element);
+        QJSValue properties = value.property(search_properties_element);
         if (properties.isValid()) {
-            QScriptValue title = properties.property(search_properties_title_value);
+            QJSValue title = properties.property(search_properties_title_value);
             if (title.isValid() && !title.toString().isEmpty()) {
                 QPlaceSearchResult result;
-                QScriptValue type = properties.property(search_type_element);
+                QJSValue type = properties.property(search_type_element);
                 if (type.isValid()) {
                     result = processPlaceElement(value);
                 }
@@ -170,17 +170,17 @@ void QPlaceJSonSearchParser::processResultElement(const QScriptValue &value)
     }
 }
 
-QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QScriptValue &results)
+QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QJSValue &results)
 {
     QPlaceSearchResult result;
     result.setType(QPlaceSearchResult::PlaceResult);
     QPlace newPlace;
 
     // Processing properties
-    QScriptValue properties = results.property(search_properties_element);
+    QJSValue properties = results.property(search_properties_element);
     if (properties.isValid()) {
         // QSearchResult properties
-        QScriptValue distance = properties.property(search_properties_distance_value);
+        QJSValue distance = properties.property(search_properties_distance_value);
         if (distance.isValid() && !distance.toString().isEmpty()) {
             bool isConverted;
             double distanceValue = distance.toString().toDouble(&isConverted);
@@ -189,7 +189,7 @@ QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QScriptValu
             }
         }
         // Place properties
-        QScriptValue value = properties.property(search_properties_title_value);
+        QJSValue value = properties.property(search_properties_title_value);
         if (value.isValid() && !value.toString().isEmpty()) {
             newPlace.setName(value.toString());
         }
@@ -222,9 +222,9 @@ QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QScriptValu
     return result;
 }
 
-void QPlaceJSonSearchParser::processContacts(const QScriptValue &properties, QPlace *place)
+void QPlaceJSonSearchParser::processContacts(const QJSValue &properties, QPlace *place)
 {
-    QScriptValue value = properties.property(search_properties_url_value);
+    QJSValue value = properties.property(search_properties_url_value);
     if (value.isValid() && !value.toString().isEmpty()) {
         QPlaceContactDetail contactDetail;
         contactDetail.setLabel(tr("Website"));
@@ -241,15 +241,15 @@ void QPlaceJSonSearchParser::processContacts(const QScriptValue &properties, QPl
 }
 
 
-void QPlaceJSonSearchParser::processCategories(const QScriptValue &categories, QPlace *place)
+void QPlaceJSonSearchParser::processCategories(const QJSValue &categories, QPlace *place)
 {
     QList<QPlaceCategory> categoriesList;
-    QScriptValueIterator it(categories);
+    QJSValueIterator it(categories);
     while (it.hasNext()) {
         it.next();
         // array contains count as last element
         if (it.name() != "length") {
-            QScriptValue value = it.value().property(search_categories_id_value);
+            QJSValue value = it.value().property(search_categories_id_value);
             if (value.isValid() && !value.toString().isEmpty()) {
                 QPlaceCategory category = QPlaceCategoriesRepository::instance()->mapCategory(
                             value.toString());
@@ -262,9 +262,9 @@ void QPlaceJSonSearchParser::processCategories(const QScriptValue &categories, Q
     place->setCategories(categoriesList);
 }
 
-void QPlaceJSonSearchParser::processRating(const QScriptValue &properties, QPlace *place)
+void QPlaceJSonSearchParser::processRating(const QJSValue &properties, QPlace *place)
 {
-    QScriptValue value = properties.property(search_properties_rating_value);
+    QJSValue value = properties.property(search_properties_rating_value);
     if (value.isValid() && !value.toString().isEmpty()) {
         bool isConverted;
         double ratingValue = value.toString().toDouble(&isConverted);
@@ -276,10 +276,10 @@ void QPlaceJSonSearchParser::processRating(const QScriptValue &properties, QPlac
     }
 }
 
-void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QGeoLocation *location)
+void QPlaceJSonSearchParser::processAddress(const QJSValue &properties, QGeoLocation *location)
 {
     QGeoAddress newAddress;
-    QScriptValue value = properties.property(search_properties_address_country);
+    QJSValue value = properties.property(search_properties_address_country);
     if (value.isValid() && !value.toString().isEmpty()) {
         newAddress.setCountry(value.toString());
     }
@@ -320,7 +320,7 @@ void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QGeo
     location->setAddress(newAddress);
 }
 
-void QPlaceJSonSearchParser::processLocation(const QScriptValue &properties, QPlace *place)
+void QPlaceJSonSearchParser::processLocation(const QJSValue &properties, QPlace *place)
 {
     QGeoLocation location;
 
@@ -330,7 +330,7 @@ void QPlaceJSonSearchParser::processLocation(const QScriptValue &properties, QPl
     double longitude;
 
     // display position
-    QScriptValue value = properties.property(search_properties_latitude_value);
+    QJSValue value = properties.property(search_properties_latitude_value);
     if (value.isValid() && !value.toString().isEmpty()) {
         latitude = value.toString().toDouble(&latOK);
     }
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
index 39d59e97..388476ed 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
@@ -57,8 +57,8 @@
 
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
-class QScriptValue;
+class QJSEngine;
+class QJSValue;
 
 QT_BEGIN_NAMESPACE
 
@@ -72,14 +72,14 @@ public:
     QList<QPlaceSearchResult> searchResults();
 
 private:
-    void processJSonData(const QScriptValue &sv);
-    void processResultElement(const QScriptValue &value);
-    QPlaceSearchResult processPlaceElement(const QScriptValue &value);
-    void processContacts(const QScriptValue &properties, QPlace *place);
-    void processCategories(const QScriptValue &categories, QPlace *place);
-    void processRating(const QScriptValue &properties, QPlace *place);
-    void processAddress(const QScriptValue &properties, QGeoLocation *location);
-    void processLocation(const QScriptValue &properties, QPlace *place);
+    void processJSonData(const QJSValue &sv);
+    void processResultElement(const QJSValue &value);
+    QPlaceSearchResult processPlaceElement(const QJSValue &value);
+    void processContacts(const QJSValue &properties, QPlace *place);
+    void processCategories(const QJSValue &categories, QPlace *place);
+    void processRating(const QJSValue &properties, QPlace *place);
+    void processAddress(const QJSValue &properties, QGeoLocation *location);
+    void processLocation(const QJSValue &properties, QPlace *place);
 private:
     QList<QPlaceSearchResult> searchResultsList;
 };
diff --git a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.cpp
index 080605c8..0311c333 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.cpp
@@ -48,7 +48,7 @@
 
 #include "qplacejsontextpredictionparser.h"
 
-#include <QtScript/QScriptEngine>
+#include <QJSEngine>
 
 #if defined(QT_PLACES_LOGGING)
     #include <QDebug>
@@ -66,12 +66,14 @@ QStringList QPlaceJSonTextPredictionParser::predictions()
     return suggestions;
 }
 
-void QPlaceJSonTextPredictionParser::processJSonData(const QScriptValue &sv)
+void QPlaceJSonTextPredictionParser::processJSonData(const QJSValue &sv)
 {
     suggestions.clear();
 
     if (sv.isValid() && sv.isArray()) {
-        qScriptValueToSequence(sv, suggestions);
+        quint32 len = sv.property("length").toUInt32();
+        for (quint32 i = 0; i < len; ++i)
+            suggestions << sv.property(i).toString();
 
 #if defined(QT_PLACES_LOGGING)
     qDebug() << "QJSonParserSuggestions::processData - list value: ";
diff --git a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h
index 245c485f..8f6f7352 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsontextpredictionparser.h
@@ -54,7 +54,7 @@
 
 #include "qplacejsonparser_p.h"
 
-class QScriptEngine;
+class QJSEngine;
 
 QT_BEGIN_NAMESPACE
 
@@ -67,7 +67,7 @@ public:
     QStringList predictions();
 
 private:
-    void processJSonData(const QScriptValue &sv);
+    void processJSonData(const QJSValue &sv);
     QStringList suggestions;
 };