diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2014-12-12 00:43:44 +1000 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-27 14:50:13 +0000 |
| commit | bbb1839392f24fe133ab182ffe36b2e2b0304edf (patch) | |
| tree | b969e8b0370312b408a2714087546178bcb43845 /src/location/maps/qgeomap.cpp | |
| parent | ab890b333b30eda0593e7d748018ef3f4c683ddf (diff) | |
| download | qtlocation-bbb1839392f24fe133ab182ffe36b2e2b0304edf.tar.gz | |
Allow HTML based copyright notices.
In addition to the image based map copyright/attribution notice allow a
geo service provider to provide a HTML string which is rendered and
displayed.
Add copyrightLinkActivated signal to the map to enable the application
to launch the url in an external browser.
The geo service providers are no longer in control of the position of
the copyright notice. For the time being it will be placed at the
bottom left of the map.
Change-Id: I49bfc58a70e9254220903d5103c714c08f327e8b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/location/maps/qgeomap.cpp')
| -rw-r--r-- | src/location/maps/qgeomap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp index 31fe29d2..c7def6da 100644 --- a/src/location/maps/qgeomap.cpp +++ b/src/location/maps/qgeomap.cpp @@ -67,7 +67,8 @@ QGeoMap::QGeoMap(QGeoMapData *mapData, QObject *parent) connect(mapData_, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SIGNAL(cameraDataChanged(QGeoCameraData))); connect(mapData_, SIGNAL(updateRequired()), this, SIGNAL(updateRequired())); connect(mapData_, SIGNAL(activeMapTypeChanged()), this, SIGNAL(activeMapTypeChanged())); - connect(mapData_, SIGNAL(copyrightsChanged(QImage,QPoint)), this, SIGNAL(copyrightsChanged(QImage,QPoint))); + connect(mapData_, SIGNAL(copyrightsChanged(QImage)), this, SIGNAL(copyrightsChanged(QImage))); + connect(mapData_, SIGNAL(copyrightsChanged(QString)), this, SIGNAL(copyrightsChanged(QString))); } QGeoMap::~QGeoMap() |