diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 15:47:08 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 16:34:34 +1000 |
| commit | bebaf4b6411b0729f73ed977798e4024bdb562ac (patch) | |
| tree | a04686679cf5f63892d610d66b8e35a5e4d5200e /src/location/maps/qgeomapcustomobject.cpp | |
| parent | 31b9ab4141bfc5b2c548e8385d91c90944c91f63 (diff) | |
| parent | 47db4be971b687c74d40b798c400c8ca99147aed (diff) | |
| download | qtlocation-bebaf4b6411b0729f73ed977798e4024bdb562ac.tar.gz | |
Merge remote branch 'origin/master' into places-base
Conflicts:
examples/declarative/mapviewer/mapviewer.qml
src/location/maps/qgeosearchmanager.h
src/location/maps/qgeosearchmanager_p.h
Change-Id: I7ae2e6b1b748cd8eee3a5cc7520a956a1fcde0cd
Diffstat (limited to 'src/location/maps/qgeomapcustomobject.cpp')
| -rw-r--r-- | src/location/maps/qgeomapcustomobject.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/location/maps/qgeomapcustomobject.cpp b/src/location/maps/qgeomapcustomobject.cpp index 26e63978..77203818 100644 --- a/src/location/maps/qgeomapcustomobject.cpp +++ b/src/location/maps/qgeomapcustomobject.cpp @@ -45,12 +45,12 @@ #include <QGraphicsItem> -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoMapCustomObject \brief The QGeoMapCustomObject class is a QGeoMapObject used to draw - a pixmap on a map. + a QGraphicsItem on a map. \inmodule QtLocation @@ -160,6 +160,11 @@ QGeoMapObject::Type QGeoMapCustomObject::type() const } /*! + If the graphics item is modified this + method should be called immediately afterwards to inform + the map that an update is required. . + + This method causes the triggerUpdate() signal to be emitted. */ void QGeoMapCustomObject::update() { @@ -168,6 +173,9 @@ void QGeoMapCustomObject::update() /*! \fn void QGeoMapCustomObject::triggerUpdate() + + This signal indicates that the graphics item has + changed and that the map needs to be updated. */ /*! @@ -282,5 +290,5 @@ QGeoMapCustomObjectPrivate::~QGeoMapCustomObjectPrivate() #include "moc_qgeomapcustomobject.cpp" -QTM_END_NAMESPACE +QT_END_NAMESPACE |