summaryrefslogtreecommitdiff
path: root/src/imports/location
diff options
context:
space:
mode:
authorWolfgang Bremer <wolfgang@w-bremer.de>2015-04-20 05:09:09 +0200
committerWolfgang Bremer <wolfgang.bremer@pelagicore.com>2015-05-08 16:21:33 +0000
commit3f697f6d73f0a7f10be90f48662f139a33d1781e (patch)
tree06c7c4066106aebe1ffe8a7fe47bb44656ccde25 /src/imports/location
parentcee1591ffce5ba923375144108075fffd3ea70a7 (diff)
downloadqtlocation-3f697f6d73f0a7f10be90f48662f139a33d1781e.tar.gz
Allow custom URLs for OSM tiles
This enables the usage of various mapping services which use the OSM API for tile distribution. One only needs to set the urlprefix parameter to a correct url and the activeMapType to the "Custom URL Map". Task-number: QTBUG-32937 Change-Id: Ib24da19dc598ccc288047ce2651e6c1792ae2054 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Diffstat (limited to 'src/imports/location')
-rw-r--r--src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
index 9ca4f74e..f2c44833 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice.cpp
@@ -113,12 +113,20 @@ void QDeclarativeGeoMapCopyrightNotice::copyrightsChanged(const QImage &copyrigh
setKeepMouseGrab(false);
setAcceptedMouseButtons(Qt::NoButton);
+ setVisible(true);
update();
}
void QDeclarativeGeoMapCopyrightNotice::copyrightsChanged(const QString &copyrightsHtml)
{
+ if (copyrightsHtml.isEmpty()) {
+ setVisible(false);
+ return;
+ } else {
+ setVisible(true);
+ }
+
if (!m_copyrightsHtml)
m_copyrightsHtml = new QTextDocument(this);