summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-06-16 07:09:15 +0200
committerLiang Qi <liang.qi@qt.io>2016-06-16 07:09:15 +0200
commitd6a8da66dc3c141621c9be4b7509a6e43c60e15c (patch)
tree38474cd8ccc13e71e4a1378e7831a00674898b36
parent02af08a705ada1ca2dac839a026a816a8e70def5 (diff)
parent643a6ad1872e87a3a54e12cca8b365475f0d1eb3 (diff)
Merge remote-tracking branch 'origin/5.7.0' into 5.7
-rw-r--r--dist/changes-5.7.03
-rw-r--r--src/datavisualization/doc/qtdatavis3d.qdocconf2
2 files changed, 4 insertions, 1 deletions
diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0
new file mode 100644
index 00000000..f896079a
--- /dev/null
+++ b/dist/changes-5.7.0
@@ -0,0 +1,3 @@
+Qt Data Visualization 5.7.0
+
+No relevant changes
diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf
index f95ecacf..62421ac9 100644
--- a/src/datavisualization/doc/qtdatavis3d.qdocconf
+++ b/src/datavisualization/doc/qtdatavis3d.qdocconf
@@ -12,7 +12,7 @@ imagedirs += ../images \
images
sourcedirs += ..
-examplesinstallpath = qtdatavisualization/datavisualization
+examplesinstallpath = datavisualization
depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc