Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make compile QtLocation after changes to QValuePrivate
Change-Id: I0ff4814d1615226140144a6185abc793f35ebab0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
  • Loading branch information
Alex Blasche authored and martinjones committed Jun 24, 2016
1 parent a53a8ff commit 43dc39a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/imports/location/qdeclarativegeoroute.cpp
Expand Up @@ -178,7 +178,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)
Expand Down
4 changes: 2 additions & 2 deletions src/imports/location/qdeclarativegeoroutemodel.cpp
Expand Up @@ -809,7 +809,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)
Expand Down Expand Up @@ -865,7 +865,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)
Expand Down
2 changes: 1 addition & 1 deletion src/imports/location/qdeclarativegeoroutesegment.cpp
Expand Up @@ -164,7 +164,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"
Expand Down
2 changes: 1 addition & 1 deletion src/imports/location/qdeclarativepolygonmapitem.cpp
Expand Up @@ -402,7 +402,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)
Expand Down
2 changes: 1 addition & 1 deletion src/imports/location/qdeclarativepolylinemapitem.cpp
Expand Up @@ -510,7 +510,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)
Expand Down

0 comments on commit 43dc39a

Please sign in to comment.