diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-22 10:22:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2015-01-26 18:09:31 +0100 |
| commit | 3a10cee763b98e13dc70e585ff59d0b8e48e60e0 (patch) | |
| tree | 5d21fb966d2eaff29d93dd72e698ee4e59e9ca90 | |
| parent | 9921fb4f2bba31093ef5168b274489500b96d238 (diff) | |
| download | qtlocation-3a10cee763b98e13dc70e585ff59d0b8e48e60e0.tar.gz | |
Make compile QtLocation after changes to QValuePrivate
Change-Id: I0ff4814d1615226140144a6185abc793f35ebab0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 309f4aa3..a7533007 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -172,7 +172,7 @@ QJSValue QDeclarativeGeoRoute::path() const pathArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(pathArray)); + return QJSValue(v4, pathArray.asReturnedValue()); } void QDeclarativeGeoRoute::setPath(const QJSValue &value) diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index f8bd144f..27308bef 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -806,7 +806,7 @@ QJSValue QDeclarativeGeoRouteQuery::waypoints() waypointArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(waypointArray)); + return QJSValue(v4, waypointArray.asReturnedValue()); } void QDeclarativeGeoRouteQuery::setWaypoints(const QJSValue &value) @@ -862,7 +862,7 @@ QJSValue QDeclarativeGeoRouteQuery::excludedAreas() const excludedAreasArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(excludedAreasArray)); + return QJSValue(v4, excludedAreasArray.asReturnedValue()); } void QDeclarativeGeoRouteQuery::setExcludedAreas(const QJSValue &value) diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index 00fcaac3..8e233047 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -156,7 +156,7 @@ QJSValue QDeclarativeGeoRouteSegment::path() const pathArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(pathArray)); + return QJSValue(v4, pathArray.asReturnedValue()); } #include "moc_qdeclarativegeoroutesegment_p.cpp" diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 9c9e14dc..689c9fb3 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -392,7 +392,7 @@ QJSValue QDeclarativePolygonMapItem::path() const pathArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(pathArray)); + return QJSValue(v4, pathArray.asReturnedValue()); } void QDeclarativePolygonMapItem::setPath(const QJSValue &value) diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index a25ff7be..ff4d3050 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -499,7 +499,7 @@ QJSValue QDeclarativePolylineMapItem::path() const pathArray->putIndexed(i, cv); } - return new QJSValuePrivate(v4, QV4::ValueRef(pathArray)); + return QJSValue(v4, pathArray.asReturnedValue()); } void QDeclarativePolylineMapItem::setPath(const QJSValue &value) |