diff options
Diffstat (limited to 'doc/src')
25 files changed, 140 insertions, 25 deletions
diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index 1b0c5fb333..92fae49a2d 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-analyze-mode.html \page creator-qml-performance-monitor.html + \if defined(qtdesignstudio) + \previouspage creator-qml-performance-monitor.html + \nextpage creator-help-overview.html + \else + \previouspage creator-analyze-mode.html \nextpage creator-valgrind-overview.html + \endif \title Profiling QML Applications diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index d4f3421d5b..e2317d7617 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -26,9 +26,13 @@ /*! \contentspage index.html - \previouspage creator-connecting-mobile.html \page creator-developing-android.html + \previouspage creator-connecting-mobile.html + \if defined(qtdesignstudio) + \nextpage creator-developing-generic-linux.html + \else \nextpage creator-developing-baremetal.html + \endif \title Connecting Android Devices diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 2fcad93e12..b239fa8a15 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -353,9 +353,14 @@ /*! \contentspage index.html - \previouspage creator-debugger-operating-modes.html \page creator-debug-mode.html + \if defined(qtdesignstudio) + \previouspage studio-debugging.html + \nextpage creator-debugging-qml.html + \else + \previouspage creator-debugger-operating-modes.html \nextpage creator-debugging-helpers.html + \endif \title Interacting with the Debugger diff --git a/doc/src/debugger/qtquick-debugger-example.qdoc b/doc/src/debugger/qtquick-debugger-example.qdoc index 5643fc3f82..5f0abb84df 100644 --- a/doc/src/debugger/qtquick-debugger-example.qdoc +++ b/doc/src/debugger/qtquick-debugger-example.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-debugging-example.html \page creator-qml-debugging-example.html + \if defined(qtdesignstudio) + \previouspage creator-qml-debugging-example.html + \nextpage creator-qml-performance-monitor.html + \else + \previouspage creator-debugging-example.html \nextpage creator-troubleshooting-debugging.html + \endif \title Debugging a Qt Quick Example Application diff --git a/doc/src/debugger/qtquick-debugging.qdoc b/doc/src/debugger/qtquick-debugging.qdoc index 5686bb44c6..92c5c43d8b 100644 --- a/doc/src/debugger/qtquick-debugging.qdoc +++ b/doc/src/debugger/qtquick-debugging.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-debugging-helpers.html \page creator-debugging-qml.html + \if defined(qtdesignstudio) + \previouspage creator-debug-mode.html + \nextpage creator-qml-debugging-example.html + \else + \previouspage creator-debugging-helpers.html \nextpage creator-debugging-example.html + \endif \title Debugging Qt Quick Projects diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc index 234d203ea4..2f0608f1c4 100644 --- a/doc/src/editors/creator-coding.qdoc +++ b/doc/src/editors/creator-coding.qdoc @@ -31,8 +31,13 @@ /*! \contentspage index.html - \previouspage creator-usability.html \page creator-coding.html + \if defined(qtdesignstudio) + \previouspage creator-keyboard-shortcuts.html + \nextpage + \else + \previouspage creator-usability.html + \endif \nextpage creator-editor-functions.html \title Coding diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc index 63401f25b1..4ef6e256fa 100644 --- a/doc/src/editors/creator-editors-options-text.qdoc +++ b/doc/src/editors/creator-editors-options-text.qdoc @@ -31,9 +31,13 @@ /*! \contentspage index.html - \previouspage creator-editor-options.html \page creator-editor-options-text.html + \previouspage creator-editor-options.html + \if defined(qtdesignstudio) + \nextpage studio-javascript.html + \else \nextpage creator-editor-fakevim.html + \endif \title Specifying Text Editor Settings diff --git a/doc/src/howto/creator-keyboard-shortcuts.qdoc b/doc/src/howto/creator-keyboard-shortcuts.qdoc index 4a6ba7b056..5a02d1a783 100644 --- a/doc/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/src/howto/creator-keyboard-shortcuts.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-cli.html \page creator-keyboard-shortcuts.html + \if defined(qtdesignstudio) + \previouspage studio-advanced.html + \nextpage creator-coding.html + \else + \previouspage creator-cli.html \nextpage creator-editor-external.html + \endif \title Keyboard Shortcuts diff --git a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc index 346f48a42a..7733fa62c0 100644 --- a/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc +++ b/doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc @@ -31,9 +31,13 @@ /*! \contentspage index.html - \previouspage creator-deploying-android.html \page creator-deployment-embedded-linux.html + \previouspage creator-deploying-android.html + \if defined(qtdesignstudio) + \nextpage creator-connecting-mobile.html + \else \nextpage creator-deployment-qnx.html + \endif \title Deploying Applications to Embedded Linux Devices diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc index f323e488a7..2f35517fdc 100644 --- a/doc/src/linux-mobile/linuxdev.qdoc +++ b/doc/src/linux-mobile/linuxdev.qdoc @@ -26,9 +26,14 @@ /*! \contentspage index.html - \previouspage creator-developing-baremetal.html \page creator-developing-generic-linux.html + \if defined(qtdesignstudio) + \previouspage creator-developing-android.html + \nextpage creator-build-process-customizing.html + \else + \previouspage creator-developing-baremetal.html \nextpage creator-developing-ios.html + \endif \title Connecting Embedded Linux Devices diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-help-overview.qdoc index cb36664bc9..70eba62c41 100644 --- a/doc/src/overview/creator-help-overview.qdoc +++ b/doc/src/overview/creator-help-overview.qdoc @@ -31,8 +31,12 @@ /*! \contentspage index.html - \previouspage creator-task-lists.html \page creator-help-overview.html + \if defined(qtdesignstudio) + \previouspage creator-qml-performance-monitor.html + \else + \previouspage creator-task-lists.html + \endif \nextpage creator-help.html \title Getting Help diff --git a/doc/src/overview/creator-mobile-targets.qdoc b/doc/src/overview/creator-mobile-targets.qdoc index 89398fbf56..899323b368 100644 --- a/doc/src/overview/creator-mobile-targets.qdoc +++ b/doc/src/overview/creator-mobile-targets.qdoc @@ -31,8 +31,12 @@ /*! \contentspage index.html - \previouspage creator-deployment-qnx.html \page creator-connecting-mobile.html + \if defined(qtdesignstudio) + \previouspage creator-deployment-embedded-linux.html + \else + \previouspage creator-deployment-qnx.html + \endif \nextpage creator-developing-android.html \title Connecting Devices diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-projects-builds-customizing.qdoc index c59182e2f9..08e894f919 100644 --- a/doc/src/projects/creator-projects-builds-customizing.qdoc +++ b/doc/src/projects/creator-projects-builds-customizing.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-developing-qnx.html \page creator-build-process-customizing.html + \if defined(qtdesignstudio) + \previouspage creator-developing-generic-linux.html + \nextpage studio-advanced.html + \else + \previouspage creator-developing-qnx.html \nextpage creator-testing.html + \endif \title Customizing the Build Process diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 342064856c..57f3a1419f 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -31,8 +31,12 @@ /*! \contentspage index.html - \previouspage creator-building-targets.html \page creator-running-targets.html + \if defined(qtdesignstudio) + \previouspage studio-live-preview.html + \else + \previouspage creator-building-targets.html + \endif \nextpage creator-deployment.html \title Running on Multiple Platforms diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc index fe6ffe9a01..e576ac9fee 100644 --- a/doc/src/projects/creator-projects-settings-dependencies.qdoc +++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc @@ -31,9 +31,13 @@ /*! \contentspage index.html - \previouspage creator-code-style-settings.html \page creator-build-dependencies.html + \previouspage creator-code-style-settings.html + \if defined(qtdesignstudio) + \nextpage studio-designing.html + \else \nextpage creator-sharing-project-settings.html + \endif \title Specifying Dependencies diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc index d0ec40ad07..718d46ca51 100644 --- a/doc/src/qtquick/qtquick-components.qdoc +++ b/doc/src/qtquick/qtquick-components.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-using-qt-quick-designer.html \page quick-components.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 \title Creating Components diff --git a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc index 614a3841ea..2f5c1ec54b 100644 --- a/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc +++ b/doc/src/qtquick/qtquick-connection-editor-bindings.qdoc @@ -25,9 +25,13 @@ /*! \contentspage {Qt Creator Manual} - \previouspage quick-dynamic-properties.html \page quick-property-bindings.html + \previouspage quick-dynamic-properties.html + \if defined(qtdesignstudio) + \nextpage quick-states.html + \else \nextpage quick-connections-backend.html + \endif \title Adding Bindings Between Properties diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index cedbea745f..10aff2aabc 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-quick-ui-forms.html \page creator-using-qt-quick-designer.html + \if defined(qtdesignstudio) + \previouspage studio-tutorials.html + \nextpage studio-preview-example.html + \else + \previouspage creator-quick-ui-forms.html \nextpage quick-components.html + \endif \title Editing QML Files in Design Mode diff --git a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc index c4ea2de21d..efc216a7f6 100644 --- a/doc/src/qtquick/qtquick-iso-icon-browser.qdoc +++ b/doc/src/qtquick/qtquick-iso-icon-browser.qdoc @@ -25,9 +25,14 @@ /*! \contentspage index.html - \previouspage quick-states.html \page qtquick-iso-icon-browser.html + \if defined(qtdesignstudio) + \previouspage qmldesigner-pathview-editor.html + \nextpage creator-quick-ui-forms.html + \else + \previouspage quick-states.html \nextpage quick-export-to-qml.html + \endif \title Browsing ISO 7000 Icons diff --git a/doc/src/qtquick/qtquick-navigator.qdoc b/doc/src/qtquick/qtquick-navigator.qdoc index 1b4f211ff5..e61e517bac 100644 --- a/doc/src/qtquick/qtquick-navigator.qdoc +++ b/doc/src/qtquick/qtquick-navigator.qdoc @@ -25,8 +25,12 @@ /*! \contentspage {Qt Creator Manual} - \previouspage quick-scalable-image.html \page qtquick-navigator.html + \if defined(qtdesignstudio) + \previouspage quick-components.html + \else + \previouspage quick-scalable-image.html + \endif \nextpage qtquick-properties.html \title Managing Item Hierarchy diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc index 9ac6ffba6c..872cd4cd8e 100644 --- a/doc/src/qtquick/qtquick-pathview-editor.qdoc +++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc @@ -25,9 +25,14 @@ /*! \contentspage index.html - \previouspage qtquick-properties.html \page qmldesigner-pathview-editor.html + \if defined(qtdesignstudio) + \previouspage studio-fonts.html + \nextpage qtquick-iso-icon-browser.html + \else + \previouspage qtquick-properties.html \nextpage qmldesigner-connections.html + \endif \title Editing PathView Properties diff --git a/doc/src/qtquick/qtquick-properties.qdoc b/doc/src/qtquick/qtquick-properties.qdoc index 95b5e41f12..4c78f25cfe 100644 --- a/doc/src/qtquick/qtquick-properties.qdoc +++ b/doc/src/qtquick/qtquick-properties.qdoc @@ -25,9 +25,13 @@ /*! \contentspage {Qt Creator Manual} - \previouspage qtquick-navigator.html \page qtquick-properties.html + \previouspage qtquick-navigator.html + \if defined(qtdesignstudio) + \nextpage studio-timeline.html + \else \nextpage qmldesigner-pathview-editor.html + \endif \title Specifying Item Properties diff --git a/doc/src/qtquick/qtquick-states.qdoc b/doc/src/qtquick/qtquick-states.qdoc index d9a6ba95e4..e03355a0a5 100644 --- a/doc/src/qtquick/qtquick-states.qdoc +++ b/doc/src/qtquick/qtquick-states.qdoc @@ -25,9 +25,14 @@ /*! \contentspage {Qt Creator Manual} - \previouspage quick-connections-backend.html \page quick-states.html + \if defined(qtdesignstudio) + \previouspage quick-property-bindings.html + \nextpage studio-fonts.html + \else + \previouspage quick-connections-backend.html \nextpage qtquick-iso-icon-browser.html + \endif \title Adding States diff --git a/doc/src/qtquick/qtquick-ui-forms.qdoc b/doc/src/qtquick/qtquick-ui-forms.qdoc index 09c82ed400..8a320061db 100644 --- a/doc/src/qtquick/qtquick-ui-forms.qdoc +++ b/doc/src/qtquick/qtquick-ui-forms.qdoc @@ -32,9 +32,14 @@ /*! \contentspage index.html - \previouspage quick-projects.html \page creator-quick-ui-forms.html + \if defined(qtdesignstudio) + \previouspage qtquick-iso-icon-browser.html + \nextpage studio-live-preview.html + \else + \previouspage quick-projects.html \nextpage creator-using-qt-quick-designer.html + \endif \title Qt Quick UI Forms diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc index a8c1559748..1909b1ae43 100644 --- a/doc/src/vcs/creator-vcs-git.qdoc +++ b/doc/src/vcs/creator-vcs-git.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-vcs-cvs.html \page creator-vcs-git.html + \if defined(qtdesignstudio) + \previouspage studio-projects.html + \nextpage studio-designing.html + \else + \previouspage creator-vcs-cvs.html \nextpage creator-vcs-mercurial.html + \endif \title Using Git |