diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:15:24 +0200 |
| commit | 56e80eb797b55458614599a82c2264c46e6e5eb0 (patch) | |
| tree | 5740b8ed298559c45f045d5daad8481e4c3eb39b /src/location | |
| parent | ba8da105e12f272bd95e2c10e7035edaaaecfa2a (diff) | |
| parent | 400c7fa8e767c65aab4b8a1d5161b5259080cec9 (diff) | |
| download | qtlocation-56e80eb797b55458614599a82c2264c46e6e5eb0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib061722a7ebc4b26bf132c67a005910f2d39400f
Diffstat (limited to 'src/location')
| -rw-r--r-- | src/location/doc/src/qtlocation.qdoc | 9 | ||||
| -rw-r--r-- | src/location/places/qplacesearchresult.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index 032f5448..2be4173a 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -62,13 +62,16 @@ /*! \page qtlocation-index.html \title Qt Location -\brief The Qt Location API provides positioning, mapping, navigation, and place search +\brief The Qt Location API provides mapping, navigation, and place search via QML and C++ interfaces. \ingroup technology-apis -The Qt Location API provides positioning, mapping, navigation, and place search via QML +The Qt Location API provides mapping, navigation, and place search via QML and C++ interfaces. +The API has not been released yet but due to its platform-independent nature is available +on all Qt platforms. + \section1 Overview The Qt Location API gives developers the ability to determine a position by diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp index 4b6ab6de..a5d49501 100644 --- a/src/location/places/qplacesearchresult.cpp +++ b/src/location/places/qplacesearchresult.cpp @@ -86,7 +86,7 @@ bool QPlaceSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) \snippet places/requesthandler.h Convert search result - The implmentation is handled in such a way that object slicing is not an issue. + The implementation is handled in such a way that object slicing is not an issue. It is not expected that client applications or backend plugins instantiate a QPlaceSearchResult directly, but rather client applications simply convert to search result subclasses and backend plugins only instantiate subclasses. |