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/editors/creator-code-refactoring.qdoc
+++ b/doc/src/editors/creator-code-refactoring.qdoc
@@ -25,9 +25,13 @@

 /*!
    \contentspage index.html
-    \previouspage creator-editor-locator.html
    \page creator-editor-refactoring.html
+    \previouspage creator-editor-locator.html
+    \if defined(qtdesignstudio)
+    \nextpage creator-editor-options.html
+    \else
    \nextpage creator-beautifier.html
+    \endif

    \title Refactoring

--- a/doc/src/editors/creator-diff-editor.qdoc
+++ b/doc/src/editors/creator-diff-editor.qdoc
@@ -31,9 +31,14 @@

 /*!
    \contentspage index.html
-    \previouspage creator-macros.html
    \page creator-diff-editor.html
+    \if defined(qtdesignstudio)
+    \previouspage qt-quick-toolbars.html
+    \nextpage creator-finding-overview.html
+    \else
+    \previouspage creator-macros.html
    \nextpage creator-clang-codemodel.html
+    \endif

    \title Comparing Files

--- a/doc/src/editors/creator-editors-options.qdoc
+++ b/doc/src/editors/creator-editors-options.qdoc
@@ -31,8 +31,12 @@

 /*!
    \contentspage index.html
-    \previouspage creator-beautifier.html
    \page creator-editor-options.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-editor-refactoring.html
+    \else
+    \previouspage creator-beautifier.html
+    \endif
    \nextpage creator-editor-options-text.html

    \title Configuring the Editor
@@ -73,13 +77,16 @@
        \li Add, modify, and remove \l{Editing Code Snippets}{code snippets} in
            \uicontrol Snippets.

+        \if defined(qtcreator)
        \li View and remove \l{Using Text Editing Macros}{text editing macros}
            in \uicontrol Macros.
+        \endif

        \li Configure \l{Completing Code}{code completion} in \uicontrol Completion.

    \endlist

+    \if defined(qtcreator)
    \section1 Related Topics

    \list
@@ -90,5 +97,6 @@
            FakeVim mode.

    \endlist
+    \endif

 */
--- a/doc/src/editors/creator-finding.qdoc
+++ b/doc/src/editors/creator-finding.qdoc
@@ -31,8 +31,13 @@

 /*!
    \contentspage index.html
-    \previouspage creator-clang-codemodel.html
    \page creator-finding-overview.html
+    \if defined(qtdesignstudio)
+    \previouspage creator-diff-editor.html
+    \else
+    \previouspage creator-clang-codemodel.html
+    \endif
+
    \nextpage creator-editor-finding.html

    \title Finding
--- a/doc/src/howto/creator-help.qdoc
+++ b/doc/src/howto/creator-help.qdoc
@@ -33,7 +33,7 @@
    \contentspage index.html
    \page creator-help.html
    \if defined(qtdesignstudio)
-    \previouspage studio-help.html
+    \previouspage studio-tutorials.html
    \nextpage studio-faq.html
    \else
    \previouspage creator-help-overview.html
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -29,7 +29,7 @@
    \page creator-developing-generic-linux.html
    \if defined(qtdesignstudio)
    \previouspage creator-developing-android.html
-    \nextpage creator-build-process-customizing.html
+    \nextpage studio-advanced.html
    \else
    \previouspage creator-developing-baremetal.html
    \nextpage creator-developing-ios.html
--- 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

--- a/doc/src/vcs/creator-vcs-git.qdoc
+++ b/doc/src/vcs/creator-vcs-git.qdoc
@@ -34,7 +34,7 @@
    \page creator-vcs-git.html
    \if defined(qtdesignstudio)
    \previouspage studio-projects.html
-    \nextpage studio-designing.html
+    \nextpage studio-importing-designs.html
    \else
    \previouspage creator-vcs-cvs.html
    \nextpage creator-vcs-mercurial.html