diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-16 14:12:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 14:12:07 +0200 |
| commit | d5619b17b3133f0aa17331c07ccb9d2b0626d7d6 (patch) | |
| tree | c0c08f35e94f562aa38d7a1338e024eb4424c9a0 /src/imports/location/qdeclarativepolylinemapitem.cpp | |
| parent | 19642842cea91a4588828362eba023c5da5ab57b (diff) | |
| parent | fafc158427e9d54298ce5c3419c1d4b6ec3b946e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e
Diffstat (limited to 'src/imports/location/qdeclarativepolylinemapitem.cpp')
| -rw-r--r-- | src/imports/location/qdeclarativepolylinemapitem.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 2899d839..d10d00a5 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -506,7 +506,9 @@ void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap * QJSValue QDeclarativePolylineMapItem::path() const { - QQmlContext *context = QQmlEngine::contextForObject(parent()); + QQmlContext *context = QQmlEngine::contextForObject(this); + if (!context) + return QJSValue(); QQmlEngine *engine = context->engine(); QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine); |