diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:02:05 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-17 09:15:39 +0000 |
| commit | 01204129d10d4da3e8696a1810fcf57ff9a278c0 (patch) | |
| tree | 010e2c8681ab980633c23a1307bbefee101f33fb /src/positioning | |
| parent | 6eef6e961bada90cdbfd5ef8539eecadf493d7d3 (diff) | |
| parent | 46ae4e4db687b8a12e639d9b248546652b680c04 (diff) | |
| download | qtlocation-01204129d10d4da3e8696a1810fcf57ff9a278c0.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I4f76eed0a59b602696c3f2c1c76df75246c69092
Diffstat (limited to 'src/positioning')
| -rw-r--r-- | src/positioning/doc/qtpositioning.qdocconf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf index 3f6438ef..41a06c49 100644 --- a/src/positioning/doc/qtpositioning.qdocconf +++ b/src/positioning/doc/qtpositioning.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtlocation.qdocconf) project = QtPositioning description = Qt Positioning Reference Documentation |