diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:55:56 +0200 |
| commit | 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7 (patch) | |
| tree | 0ad7002074b2996460d72722435c97d76ddc6466 /src/location/declarativemaps/qdeclarativegeocodemodel.cpp | |
| parent | 420139a36dace3bb8f78f2d65b30f7657668d888 (diff) | |
| parent | 5542c721af400750b13bd411dfbb13891f49618e (diff) | |
| download | qtlocation-40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f7.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I3241efba9c3a32a4a097a67fd6432c45aad8e6ef
Diffstat (limited to 'src/location/declarativemaps/qdeclarativegeocodemodel.cpp')
| -rw-r--r-- | src/location/declarativemaps/qdeclarativegeocodemodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp index d874f9a2..ee435a5a 100644 --- a/src/location/declarativemaps/qdeclarativegeocodemodel.cpp +++ b/src/location/declarativemaps/qdeclarativegeocodemodel.cpp @@ -69,9 +69,9 @@ QT_BEGIN_NAMESPACE will update its output automatically. Otherwise, the \l{update} method may be used. By default, autoUpdate is disabled. - The data stored and returned in the GeocodeModel consists of \l{Location} + The data stored and returned in the GeocodeModel consists of \l [QML] {Location} objects, as a list with the role name "locationData". See the documentation - for \l{Location} for further details on its structure and contents. + for \l [QML] {Location} for further details on its structure and contents. \section2 Example Usage @@ -519,7 +519,7 @@ int QDeclarativeGeocodeModel::count() const /*! \qmlmethod Location QtLocation::GeocodeModel::get(int) - Returns the Location at given index. Use \l count property to check the + Returns the \l [QML] {Location} at given index. Use \l count property to check the amount of locations available. The locations are indexed from zero, so the accessible range is 0...(count - 1). |