Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e

2 files changed, 8 insertions, 2 deletions

diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
index 289ea3d9..7b5a5765 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
@@ -148,7 +148,11 @@ void QDeclarativeGeoMapCopyrightNotice::copyrightsChanged(const QString &copyrig
     m_copyrightsImage.fill(qPremultiply(qRgba(255, 255, 255, 128)));
 
     QPainter painter(&m_copyrightsImage);
-    m_copyrightsHtml->drawContents(&painter);
+    //m_copyrightsHtml->drawContents(&painter);  // <- this uses the default application palette, that might have, f.ex., white text
+    QAbstractTextDocumentLayout::PaintContext ctx;
+    ctx.palette.setColor(QPalette::Text, QColor(QStringLiteral("black")));
+    ctx.palette.setColor(QPalette::Link, QColor(QStringLiteral("blue")));
+    m_copyrightsHtml->documentLayout()->draw(&painter, ctx);
 
     setWidth(m_copyrightsImage.width());
     setHeight(m_copyrightsImage.height());
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);