summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-01-23 17:37:59 +0100
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-01-30 09:29:15 +0000
commit1d867cd2e4ab1560a22294f97e03a779200ef4db (patch)
treee7f54092f522d6a9c020afdcf9b18f3be89aef2d /src/imports
parent0a5dd29d4b02a192ec7e691cf88f623152ce100b (diff)
downloadqtlocation-1d867cd2e4ab1560a22294f97e03a779200ef4db.tar.gz
Expose QDeclarativeGeoMapCopyrightNotice in QML
This change allows the user to create a separate MapCopyrightsNotice, and source the notice from a Map element. The purpose is to allow the user to stack multiple Map elements and have a cleanly arranged set of copyright notices on top of this stack. To do so it is now possible to setCopyrightsVisible(false) on all the Map elements, then declare one notice per map, and arrange it appropriately on top of the stack. As for any other QQuickItem, a MapCopyrightsNotice cannot be declared inside a Map {} element, and if done so, a a warning will be produced. Change-Id: Ie38dec40cf25f0c44d1da39fd74469944eb79eba Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/location/location.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index f1494a04..44f4bd5a 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -51,6 +51,7 @@
#include <QtLocation/private/qdeclarativepolylinemapitem_p.h>
#include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
#include <QtLocation/private/qdeclarativegeomapparameter_p.h>
+#include <QtLocation/private/qdeclarativegeomapcopyrightsnotice_p.h>
//Place includes
#include <QtLocation/private/qdeclarativecategory_p.h>
@@ -171,6 +172,7 @@ public:
// Register the 5.9 types
minor = 9;
qmlRegisterType<QDeclarativeGeoMapParameter>(uri, major, minor, "MapParameter");
+ qmlRegisterType<QDeclarativeGeoMapCopyrightNotice>(uri, major, minor, "MapCopyrightNotice");
//registrations below are version independent