remove second watermark image

5 files changed, 7 insertions, 15 deletions

diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index 413a77d886..291c96c666 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -81,7 +81,6 @@ namespace
 QGeoTiledMapDataNokia::QGeoTiledMapDataNokia(QGeoMappingManagerEngineNokia *engine) :
     QGeoTiledMapData(engine),
     watermark(":/images/watermark.png"),
-    watermarkDark(":/images/watermark_dark.png"),
     m_logoPosition(engine->logoPosition())
 {
     m_networkManager = new QNetworkAccessManager(this);
@@ -207,15 +206,10 @@ QString QGeoTiledMapDataNokia::getViewCopyright()
  */
 void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyleOptionGraphicsItem *)
 {
-    bool whiteLogo = mapType() == QGraphicsGeoMap::SatelliteMapDay
-            || mapType() == QGraphicsGeoMap::SatelliteMapNight
-            || mapType() == QGraphicsGeoMap::TerrainMap;
-
-    const QPixmap & currentWatermark = whiteLogo ? watermark : watermarkDark;
-
-    QColor fontColor = whiteLogo ? Qt::white : Qt::black;
-    if (!whiteLogo)
+    QColor fontColor(Qt::white);
+    if (mapType() == QGraphicsGeoMap::StreetMap)
     {
+       fontColor = Qt::black;
        fontColor.setAlphaF(0.5);
     }
 
@@ -227,8 +221,8 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle
     painter->setFont(font);
     painter->setPen(fontColor);
 
-    const int offset = 5;
     QRect viewport = painter->combinedTransform().inverted().mapRect(painter->viewport());
+    const int offset = 5;
     viewport.adjust(offset, offset, -offset, -offset);
 
     QString copyrightText = getViewCopyright();
@@ -236,13 +230,13 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle
 
     QRect watermarkViewRect(viewport), copyrightViewRect(viewport);
     watermarkViewRect.setHeight(watermarkViewRect.height() - copyrightRect.height());
-    copyrightViewRect.adjust(0, currentWatermark.height(), 0, 0);
+    copyrightViewRect.adjust(0, watermark.height(), 0, 0);
 
-    QRect watermarkRect(currentWatermark.rect());
+    QRect watermarkRect(watermark.rect());
     AdjustLogo(watermarkViewRect, watermarkRect, m_logoPosition);
     AdjustLogo(copyrightViewRect, copyrightRect, m_logoPosition);
 
-    painter->drawPixmap(watermarkRect, currentWatermark);
+    painter->drawPixmap(watermarkRect, watermark);
     painter->drawText(copyrightRect, Qt::TextWordWrap, copyrightText);
 
     painter->restore();
diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
index acf1ab78f7..002d144a4b 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.h
@@ -86,7 +86,6 @@ private:
     Q_DISABLE_COPY(QGeoTiledMapDataNokia)
 
     QPixmap watermark;
-    QPixmap watermarkDark;
 
     QNetworkAccessManager *m_networkManager;
 
diff --git a/plugins/geoservices/nokia/resource.qrc b/plugins/geoservices/nokia/resource.qrc
index c4541beab3..e2626c327c 100644
--- a/plugins/geoservices/nokia/resource.qrc
+++ b/plugins/geoservices/nokia/resource.qrc
@@ -1,6 +1,5 @@
 <RCC>
     <qresource prefix="/images">
         <file>watermark.png</file>
-        <file>watermark_dark.png</file>
     </qresource>
 </RCC>
diff --git a/plugins/geoservices/nokia/watermark.png b/plugins/geoservices/nokia/watermark.png
index d87caf170e..ed8f332110 100644
--- a/plugins/geoservices/nokia/watermark.png
+++ b/plugins/geoservices/nokia/watermark.png
diff --git a/plugins/geoservices/nokia/watermark_dark.png b/plugins/geoservices/nokia/watermark_dark.png
deleted file mode 100644
index ed8f332110..0000000000
--- a/plugins/geoservices/nokia/watermark_dark.png
+++ /dev/null