diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-05 10:57:37 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-05 10:57:38 +0200 |
| commit | 498db2f51ae0c509e57473207c34253f78e6f429 (patch) | |
| tree | dcdc450e914af3863209bb5ed9c8a97146af4a33 /src/positioningquick | |
| parent | f88ee640ad69f3d77a790225f6e8c3e12437b49a (diff) | |
| parent | 0ffb89591a9e2463b36948cdd5e2948de72e14c4 (diff) | |
| download | qtlocation-498db2f51ae0c509e57473207c34253f78e6f429.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If5e87356cdb8668fc66612099be2b9a1deae5cfd
Diffstat (limited to 'src/positioningquick')
| -rw-r--r-- | src/positioningquick/qdeclarativeposition.cpp | 2 | ||||
| -rw-r--r-- | src/positioningquick/qdeclarativepositionsource.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/positioningquick/qdeclarativeposition.cpp b/src/positioningquick/qdeclarativeposition.cpp index 7e72f358..b63aaab8 100644 --- a/src/positioningquick/qdeclarativeposition.cpp +++ b/src/positioningquick/qdeclarativeposition.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Position - \instantiates QDeclarativePosition + //! \instantiates QDeclarativePosition \inqmlmodule QtPositioning \since 5.2 diff --git a/src/positioningquick/qdeclarativepositionsource.cpp b/src/positioningquick/qdeclarativepositionsource.cpp index d290de25..ec462f23 100644 --- a/src/positioningquick/qdeclarativepositionsource.cpp +++ b/src/positioningquick/qdeclarativepositionsource.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype PositionSource - \instantiates QDeclarativePositionSource + //! \instantiates QDeclarativePositionSource \inqmlmodule QtPositioning \since 5.2 |