summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-04-17 10:56:55 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-04-27 10:05:48 +0000
commit2025134555dd8442435606c9f6d762b3790fb237 (patch)
tree8faffe9f6936c630ebe9eff290839881530c390f
parentac55e4222bd752bbc9ac1854cb0e000e7ded9228 (diff)
Doc: Fix documentation issues
* Restore removed example snippet tags * Fix issues in the .qdocconf file Task-number: QTBUG-91875 Change-Id: Iff7068204b5713fbf9f9f568834b55c5c282abba Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 3eba29e47e6ef55960e670095444b977defce345) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/datavisualization/qmlbars/qml/qmlbars/main.qml2
-rw-r--r--src/datavisualization/doc/qtdatavis3d.qdocconf13
2 files changed, 8 insertions, 7 deletions
diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
index a3de7142..b32a2aa0 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
@@ -251,6 +251,7 @@ Rectangle {
}
}
+ //! [2]
onCurrentRowChanged: {
var timestamp = graphData.model.get(currentRow).timestamp
var pattern = /(\d\d\d\d)-(\d\d)/
@@ -268,6 +269,7 @@ Rectangle {
else
secondarySeries.selectedBar = Qt.point(rowIndex, colIndex)
}
+ //! [2]
ColumnLayout {
id: controlLayout
diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf
index 0bc05412..8ff05772 100644
--- a/src/datavisualization/doc/qtdatavis3d.qdocconf
+++ b/src/datavisualization/doc/qtdatavis3d.qdocconf
@@ -6,17 +6,16 @@ description = Qt Data Visualization Reference Documentation
version = $QT_VERSION
buildversion = Qt Data Visualization | Commercial or GPLv3
+examplesinstallpath = datavisualization
exampledirs += ../../../examples/datavisualization \
snippets
-headerdirs += ..
+{headerdirs,sourcedirs} += ..
+
imagedirs += ../images \
images
-sourcedirs += ..
-
-examplesinstallpath = datavisualization
-depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc qtwidgets
+depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc qtcmake qtwidgets
qhp.projects = QtDataVisualization
@@ -32,11 +31,11 @@ qhp.QtDataVisualization.customFilters.Qt.filterAttributes = qtdatavisualiz
qhp.QtDataVisualization.subprojects = gettingstarted examples classes types
qhp.QtDataVisualization.subprojects.gettingstarted.title = Getting Started
qhp.QtDataVisualization.subprojects.gettingstarted.indexTitle = Qt Data Visualization Getting Started
-qhp.QtDataVisualization.subprojects.gettingstarted.selectors = fake:page
+qhp.QtDataVisualization.subprojects.gettingstarted.selectors = doc:page
qhp.QtDataVisualization.subprojects.gettingstarted.sortPages = true
qhp.QtDataVisualization.subprojects.examples.title = Examples
qhp.QtDataVisualization.subprojects.examples.indexTitle = Qt Data Visualization Examples
-qhp.QtDataVisualization.subprojects.examples.selectors = fake:example
+qhp.QtDataVisualization.subprojects.examples.selectors = doc:example
qhp.QtDataVisualization.subprojects.examples.sortPages = true
qhp.QtDataVisualization.subprojects.classes.title = C++ Classes
qhp.QtDataVisualization.subprojects.classes.indexTitle = Qt Data Visualization C++ Classes