summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-12-04 09:42:38 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-12-04 08:44:10 +0000
commit02c1fc0defed27d4050689d983c8fb8355e57873 (patch)
treeaf82cdb1f879bf498f0551eccc30749183ea32f1
parent26b34a0cd4c25ea2303ca6f8c73164064b450756 (diff)
downloadqt-creator-02c1fc0defed27d4050689d983c8fb8355e57873.tar.gz
Doc: Fix navigation links after structure changes
...in Qt Design Studio manual Change-Id: I6ff4aac1d142fc474fcafa85bc5cb3b5b8fa7675 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--doc/src/qtquick/qtquick-connection-editor.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-live-preview.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-pathview-editor.qdoc6
-rw-r--r--doc/src/qtquick/qtquick-properties.qdoc4
-rw-r--r--doc/src/qtquick/qtquick-states.qdoc3
-rw-r--r--doc/src/qtquick/qtquick-timeline.qdoc4
6 files changed, 13 insertions, 8 deletions
diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc
index ad781ab5d4..a79d9c88fd 100644
--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -25,7 +25,7 @@
/*!
\contentspage index.html
- \previouspage qmldesigner-pathview-editor.html
+ \previouspage quick-states.html
\page qmldesigner-connections.html
\nextpage quick-signals.html
diff --git a/doc/src/qtquick/qtquick-live-preview.qdoc b/doc/src/qtquick/qtquick-live-preview.qdoc
index 9145c2826a..4586f098f4 100644
--- a/doc/src/qtquick/qtquick-live-preview.qdoc
+++ b/doc/src/qtquick/qtquick-live-preview.qdoc
@@ -26,7 +26,7 @@
/*!
\contentspage {Qt Creator}
\if defined(qtdesignstudio)
- \previouspage creator-quick-ui-forms.html
+ \previouspage studio-3d-camera.html
\else
\previouspage creator-building-running.html
\endif
diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc
index 16cfad2e79..41b5bb02e9 100644
--- a/doc/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc
@@ -26,15 +26,13 @@
/*!
\contentspage index.html
\page qmldesigner-pathview-editor.html
+ \previouspage quick-states.html
\if defined(qtdesignstudio)
- \previouspage studio-fonts.html
- \nextpage creator-quick-ui-forms.html
+ \nextpage studio-3d.html
\else
- \previouspage quick-states.html
\nextpage qtquick-iso-icon-browser.html
\endif
-
\title Editing PathView Properties
A \l{PathView}{Path View} lays out data provided by data models on a
diff --git a/doc/src/qtquick/qtquick-properties.qdoc b/doc/src/qtquick/qtquick-properties.qdoc
index e7ce811e49..e0995815f1 100644
--- a/doc/src/qtquick/qtquick-properties.qdoc
+++ b/doc/src/qtquick/qtquick-properties.qdoc
@@ -27,7 +27,11 @@
\contentspage {Qt Creator Manual}
\page qtquick-properties.html
\previouspage qtquick-navigator.html
+ \if defined(qtdesignstudio)
+ \nextpage studio-fonts.html
+ \else
\nextpage studio-timeline.html
+ \endif
\title Specifying Item Properties
diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc
index 975e1f0959..58a02677f6 100644
--- a/doc/src/qtquick/qtquick-states.qdoc
+++ b/doc/src/qtquick/qtquick-states.qdoc
@@ -28,11 +28,10 @@
\page quick-states.html
\if defined(qtdesignstudio)
\previouspage quick-property-bindings.html
- \nextpage studio-fonts.html
\else
\previouspage quick-connections-backend.html
- \nextpage qmldesigner-pathview-editor.html
\endif
+ \nextpage qmldesigner-pathview-editor.html
\title Adding States
diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc
index 59eda721c0..96c5e7c540 100644
--- a/doc/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/src/qtquick/qtquick-timeline.qdoc
@@ -25,7 +25,11 @@
/*!
\contentspage {Qt Design Studio Manual}
+ \if defined(qtdesignstudio)
+ \previouspage studio-adding-dynamics.html
+ \else
\previouspage qtquick-properties.html
+ \endif
\page studio-timeline.html
\nextpage qmldesigner-connections.html