Doc: Reflect changes in Qt Design Studio Manual structure

Change-Id: I811c8715e02e8013c7e34c6dbf0b7a1e60205383 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-24 13:46:38 +02:00
parent 5bd7af7a90
commit 3b2a7c0b52
12 changed files with 39 additions and 13 deletions
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -32,11 +32,10 @@
 /*!
    \contentspage index.html
    \page quick-components.html
+    \previouspage creator-using-qt-quick-designer.html
    \if defined(qtdesignstudio)
-    \previouspage studio-designing.html
    \nextpage qtquick-navigator.html
    \else
-    \previouspage creator-using-qt-quick-designer.html
    \nextpage quick-buttons.html
    \endif

--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -66,6 +66,8 @@
        \li \l{Connecting Objects to Signals}
        \li \l{Specifying Dynamic Properties}
        \li \l{Adding Bindings Between Properties}
+        \if defined(qtcreator)
        \li \l{Managing C++ Backend Objects}
+        \endif
    \endlist
 */
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -33,12 +33,11 @@
    \contentspage index.html
    \page creator-using-qt-quick-designer.html
    \if defined(qtdesignstudio)
-    \previouspage studio-tutorials.html
-    \nextpage studio-preview-example.html
+    \previouspage studio-prototyping.html
    \else
    \previouspage creator-quick-ui-forms.html
-    \nextpage quick-components.html
    \endif
+    \nextpage quick-components.html

    \title Editing QML Files in Design Mode

--- a/doc/src/qtquick/qtquick-profiler.qdoc
+++ b/doc/src/qtquick/qtquick-profiler.qdoc
@@ -34,7 +34,7 @@
    \page creator-qml-performance-monitor.html
    \if defined(qtdesignstudio)
    \previouspage creator-qml-debugging-example.html
-    \nextpage creator-help-overview.html
+    \nextpage studio-help.html
    \else
    \previouspage creator-analyze-mode.html
    \nextpage creator-valgrind-overview.html
--- a/doc/src/qtquick/qtquick-toolbars.qdoc
+++ b/doc/src/qtquick/qtquick-toolbars.qdoc
@@ -33,7 +33,11 @@
    \contentspage index.html
    \previouspage creator-indenting-code.html
    \page qt-quick-toolbars.html
+    \if defined(qtdesignstudio)
+    \nextpage creator-diff-editor.html
+    \else
    \nextpage creator-editor-codepasting.html
+    \endif

    \title Using Qt Quick Toolbars