diff --git a/doc/src/editors/creator-code-refactoring.qdoc b/doc/src/editors/creator-code-refactoring.qdoc index 5fe8c024a23..8bcfc6fc5c3 100644 --- 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 diff --git a/doc/src/editors/creator-diff-editor.qdoc b/doc/src/editors/creator-diff-editor.qdoc index efd2005405e..80494a36e7f 100644 --- 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 diff --git a/doc/src/editors/creator-editors-options.qdoc b/doc/src/editors/creator-editors-options.qdoc index 4e7305d58d3..b7084c4adc5 100644 --- 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 */ diff --git a/doc/src/editors/creator-finding.qdoc b/doc/src/editors/creator-finding.qdoc index 48412914199..c9a4c371b74 100644 --- 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 diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index e2209137ba8..4bbfda9d021 100644 --- 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 diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index 2f35517fdc0..85d415f565f 100644 --- 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 diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index b41bc0c2ba8..a5cb902760f 100644 --- 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 diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc index 92a526b2e70..57953505654 100644 --- 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 */ diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 10aff2aabc9..84ee8b1abcb 100644 --- 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 diff --git a/doc/src/qtquick/qtquick-profiler.qdoc b/doc/src/qtquick/qtquick-profiler.qdoc index f87f429ea4d..939c0b50814 100644 --- 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 diff --git a/doc/src/qtquick/qtquick-toolbars.qdoc b/doc/src/qtquick/qtquick-toolbars.qdoc index 76a197a4220..834bc605f78 100644 --- 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 diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index 1909b1ae43e..77a9d93cefd 100644 --- 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