diff options
Diffstat (limited to 'src/location/doc')
-rw-r--r-- | src/location/doc/qtlocation.qdocconf | 5 | ||||
-rw-r--r-- | src/location/doc/src/qml-maps.qdoc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf index 8840e3f5..12f6de8b 100644 --- a/src/location/doc/qtlocation.qdocconf +++ b/src/location/doc/qtlocation.qdocconf @@ -30,7 +30,7 @@ qhp.QtLocation.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtlocation/qtlocation.tags -depends += qtcore qtdoc qtgui qtquick qtqml qtnetwork qtpositioning qtlinguist +depends += qtcore qtdoc qtgui qtwidgets qtquick qtquickcontrols qtqml qtqmlmodels qtnetwork qtpositioning qtlinguist headerdirs += .. @@ -47,3 +47,6 @@ imagedirs += images navigation.landingpage = "Qt Location" navigation.cppclassespage = "Qt Location C++ Classes" navigation.qmltypespage = "Qt Location QML Types" + +# Fail the documentation build when warnings get introduced +warninglimit = 0 diff --git a/src/location/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc index 6a78ae32..8c7407fd 100644 --- a/src/location/doc/src/qml-maps.qdoc +++ b/src/location/doc/src/qml-maps.qdoc @@ -175,10 +175,10 @@ The \l Map item also supports user interface interactions with the map using tactile and mouse gestures. That is features such as swiping to pan, pinching to zoom. -Enabling and configuring pinch and flickable is easy within the \l Map type. +Enabling and configuring pinch and flickable is easy within the \l MapView type. \snippet mapviewer/map/MapComponent.qml top -\snippet mapviewer/map/MapComponent.qml mapnavigation +\snippet mapviewer/map/MapComponent.qml handler \snippet mapviewer/map/MapComponent.qml end Zoom can also be controlled by other objects like sliders, with binding |