diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-16 10:26:05 +0200 |
|---|---|---|
| committer | paolo <paolo.angelelli@qt.io> | 2018-05-16 10:26:17 +0200 |
| commit | de884ff5669fb9a6c0f50e69d6eb2557ca9dea94 (patch) | |
| tree | c3e797ca6470afdd03d08306e3a0f00b5e54205e /src/positioning | |
| parent | 3c4b3d3666d66584144975a2d2278927392cce8e (diff) | |
| parent | b7c7fc30fb9273936426914d78d1bf0d64314fe4 (diff) | |
| download | qtlocation-de884ff5669fb9a6c0f50e69d6eb2557ca9dea94.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ied604f4c229a976749457034eba8ae2f2a385c06
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/doc/snippets/doc_src_qtpositioning.qml | 2 | ||||
| -rw-r--r-- | src/positioning/doc/src/qtpositioning-qml.qdoc | 2 | ||||
| -rw-r--r-- | src/positioning/doc/src/qtpositioning.qdoc | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/positioning/doc/snippets/doc_src_qtpositioning.qml b/src/positioning/doc/snippets/doc_src_qtpositioning.qml index 73b2fd56..ee6e8328 100644 --- a/src/positioning/doc/snippets/doc_src_qtpositioning.qml +++ b/src/positioning/doc/snippets/doc_src_qtpositioning.qml @@ -49,7 +49,7 @@ ****************************************************************************/ //! [import] -import QtPositioning 5.2 +import QtPositioning 5.11 //! [import] Item { diff --git a/src/positioning/doc/src/qtpositioning-qml.qdoc b/src/positioning/doc/src/qtpositioning-qml.qdoc index e839dc48..7c9567cb 100644 --- a/src/positioning/doc/src/qtpositioning-qml.qdoc +++ b/src/positioning/doc/src/qtpositioning-qml.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \qmlmodule QtPositioning 5.2 + \qmlmodule QtPositioning 5.11 \title Qt Positioning QML Types \ingroup qmlmodules \brief Provides QML types for position information diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index 2a966b19..f0094ff0 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -93,6 +93,15 @@ The .pro file should have the \e positioning keyword added \code QT += positioning \endcode +\section1 Licenses + +Qt Positioning is available under commercial licenses from \l{The Qt Company}. +In addition, it is available under free software licenses. Since Qt 5.4, +these free software licenses are +\l{GNU Lesser General Public License, version 3}, or +the \l{GNU General Public License, version 2}. +See \l{Qt Licensing} for further details. + \section1 Related Information \section2 Overview |