diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-24 02:37:14 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-24 02:37:14 +1000 |
| commit | 55498fce0c53ff62dd743c25f45e624b48b8f270 (patch) | |
| tree | 529bdc7f73319771f49c6c4cdf8ce3469aecad71 /plugins | |
| parent | 3055863d8ec85498100164853a782940907f368c (diff) | |
| parent | eeae5cf85933eaf509e0b27bb29cd9f7eb7002f8 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
Fix location doc file names clash
Fill s_qstrings in QContactStringHolder::operator=(const QString&)
disable gypsy and geoclue for harmattan platform
Diffstat (limited to 'plugins')
6 files changed, 6 insertions, 6 deletions
diff --git a/plugins/declarative/location/qdeclarativecoordinate.cpp b/plugins/declarative/location/qdeclarativecoordinate.cpp index 1c304789a7..e4aafbea39 100644 --- a/plugins/declarative/location/qdeclarativecoordinate.cpp +++ b/plugins/declarative/location/qdeclarativecoordinate.cpp @@ -53,7 +53,7 @@ QTM_BEGIN_NAMESPACE \inherits QObject \since Mobility 1.2 - \ingroup qml-location + \ingroup qml-location-plugin The Coordinate element is part of the \bold{QtMobility.location 1.1} module. */ diff --git a/plugins/declarative/location/qdeclarativegeoaddress.cpp b/plugins/declarative/location/qdeclarativegeoaddress.cpp index 83a0d16763..1cef047fc5 100644 --- a/plugins/declarative/location/qdeclarativegeoaddress.cpp +++ b/plugins/declarative/location/qdeclarativegeoaddress.cpp @@ -46,7 +46,7 @@ QTM_BEGIN_NAMESPACE /*! \qmlclass Address QDeclarativeGeoAddress \brief The Address element presents an address. - \ingroup qml-location + \ingroup qml-location-plugin \since Mobility 1.2 The Address element presents an address of a location. diff --git a/plugins/declarative/location/qdeclarativegeoboundingbox.cpp b/plugins/declarative/location/qdeclarativegeoboundingbox.cpp index 3031ac5eb4..7213418373 100644 --- a/plugins/declarative/location/qdeclarativegeoboundingbox.cpp +++ b/plugins/declarative/location/qdeclarativegeoboundingbox.cpp @@ -47,7 +47,7 @@ QTM_BEGIN_NAMESPACE /*! \qmlclass BoundingBox QDeclarativeGeoBoundingBox \brief The QGeoBoundingBox class defines a rectangular geographic area. - \ingroup qml-location + \ingroup qml-location-plugin \since Mobility 1.2 The BoundingBox class defines a rectangular geographic area. diff --git a/plugins/declarative/location/qdeclarativegeoplace.cpp b/plugins/declarative/location/qdeclarativegeoplace.cpp index 261b9fbbcd..a5d043848d 100644 --- a/plugins/declarative/location/qdeclarativegeoplace.cpp +++ b/plugins/declarative/location/qdeclarativegeoplace.cpp @@ -46,7 +46,7 @@ QTM_BEGIN_NAMESPACE /*! \qmlclass Place QDeclarativeGeoPlace \brief The A Place element presents basic information about a place. - \ingroup qml-location + \ingroup qml-location-plugin \since Mobility 1.2 This element is part of the \bold{QtMobility.location 1.1} module. diff --git a/plugins/declarative/location/qdeclarativeposition.cpp b/plugins/declarative/location/qdeclarativeposition.cpp index 9a0aab33d8..adc16a2152 100644 --- a/plugins/declarative/location/qdeclarativeposition.cpp +++ b/plugins/declarative/location/qdeclarativeposition.cpp @@ -53,7 +53,7 @@ QTM_BEGIN_NAMESPACE \brief The Position element holds various positional data, such as coordinate (longitude, latitude, altitude) and speed. \inherits QObject - \ingroup qml-location + \ingroup qml-location-plugin \since Mobility 1.2 The Position element holds various positional data, such as \l coordinate, diff --git a/plugins/declarative/location/qdeclarativepositionsource.cpp b/plugins/declarative/location/qdeclarativepositionsource.cpp index 31c4f0eee7..a0f6c1df30 100644 --- a/plugins/declarative/location/qdeclarativepositionsource.cpp +++ b/plugins/declarative/location/qdeclarativepositionsource.cpp @@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE current position. \inherits QObject - \ingroup qml-location + \ingroup qml-location-plugin \since Mobility 1.2 The PositionSource element allows you to get information about your current position. |