diff options
| author | Cristian Adam <cristian.adam@nokia.com> | 2011-07-20 10:49:47 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@nokia.com> | 2011-07-20 10:49:47 +0200 |
| commit | 611b14c43dc702141b7bd933b9665a492f7fba9b (patch) | |
| tree | b448e584476618a50322aead2178771bd8f32ca1 /plugins/geoservices | |
| parent | 0699b630ee62542a97abcad1ea671b4f0d00d6a3 (diff) | |
| parent | cc3aac94fcb33dbc09d50faccc9e535fe4059b68 (diff) | |
Merge branch 'maps-api' of scm.dev.nokia.troll.no:qtmobility/qtm-location into maps-api
Diffstat (limited to 'plugins/geoservices')
| -rw-r--r-- | plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp | 4 | ||||
| -rw-r--r-- | plugins/geoservices/nokia/watermark.png | bin | 1542 -> 1003 bytes |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp index a2b6dc2373..87461430fc 100644 --- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp +++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp @@ -255,8 +255,8 @@ void QGeoTiledMapDataNokia::paintProviderNotices(QPainter *painter, const QStyle viewport.adjust(offset, offset, -offset, -offset); QRect watermarkViewRect(viewport), copyrightViewRect(viewport); - watermarkViewRect.setWidth(watermarkViewRect.width() - lastCopyrightRect.width()); - copyrightViewRect.adjust(watermark.width(), 0, 0, 0); + watermarkViewRect.setHeight(watermarkViewRect.height() - lastCopyrightRect.height()); + copyrightViewRect.adjust(0, watermark.height(), 0, 0); QRect watermarkRect(watermark.rect()), copyrightRect(lastCopyrightRect); AdjustLogo(watermarkViewRect, watermarkRect, m_logoPosition); diff --git a/plugins/geoservices/nokia/watermark.png b/plugins/geoservices/nokia/watermark.png Binary files differindex fe7abc3d0f..2cf094b76c 100644 --- a/plugins/geoservices/nokia/watermark.png +++ b/plugins/geoservices/nokia/watermark.png |
