diff --git a/doc/src/debugger/creator-debugger-example.qdoc b/doc/src/debugger/creator-only/creator-debugger-example.qdoc similarity index 100% rename from doc/src/debugger/creator-debugger-example.qdoc rename to doc/src/debugger/creator-only/creator-debugger-example.qdoc diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-only/creator-debugger-setup.qdoc similarity index 100% rename from doc/src/debugger/creator-debugger-setup.qdoc rename to doc/src/debugger/creator-only/creator-debugger-setup.qdoc diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-only/creator-debugger.qdoc similarity index 100% rename from doc/src/debugger/creator-debugger.qdoc rename to doc/src/debugger/creator-only/creator-debugger.qdoc diff --git a/doc/src/editors/creator-beautifier.qdoc b/doc/src/editors/creator-only/creator-beautifier.qdoc similarity index 100% rename from doc/src/editors/creator-beautifier.qdoc rename to doc/src/editors/creator-only/creator-beautifier.qdoc diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-only/creator-clang-codemodel.qdoc similarity index 100% rename from doc/src/editors/creator-clang-codemodel.qdoc rename to doc/src/editors/creator-only/creator-clang-codemodel.qdoc diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-only/creator-mime-types.qdoc similarity index 100% rename from doc/src/editors/creator-mime-types.qdoc rename to doc/src/editors/creator-only/creator-mime-types.qdoc diff --git a/doc/src/editors/creator-modeling.qdoc b/doc/src/editors/creator-only/creator-modeling.qdoc similarity index 100% rename from doc/src/editors/creator-modeling.qdoc rename to doc/src/editors/creator-only/creator-modeling.qdoc diff --git a/doc/src/editors/creator-scxml.qdoc b/doc/src/editors/creator-only/creator-scxml.qdoc similarity index 100% rename from doc/src/editors/creator-scxml.qdoc rename to doc/src/editors/creator-only/creator-scxml.qdoc diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc index 8fabed02525..e2209137ba8 100644 --- a/doc/src/howto/creator-help.qdoc +++ b/doc/src/howto/creator-help.qdoc @@ -31,9 +31,14 @@ /*! \contentspage index.html - \previouspage creator-help-overview.html \page creator-help.html + \if defined(qtdesignstudio) + \previouspage studio-help.html + \nextpage studio-faq.html + \else + \previouspage creator-help-overview.html \nextpage creator-faq.html + \endif \title Using the Help Mode diff --git a/doc/src/howto/creator-autotest.qdoc b/doc/src/howto/creator-only/creator-autotest.qdoc similarity index 100% rename from doc/src/howto/creator-autotest.qdoc rename to doc/src/howto/creator-only/creator-autotest.qdoc diff --git a/doc/src/howto/creator-cli.qdoc b/doc/src/howto/creator-only/creator-cli.qdoc similarity index 100% rename from doc/src/howto/creator-cli.qdoc rename to doc/src/howto/creator-only/creator-cli.qdoc diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-only/creator-external-tools.qdoc similarity index 100% rename from doc/src/howto/creator-external-tools.qdoc rename to doc/src/howto/creator-only/creator-external-tools.qdoc diff --git a/doc/src/howto/creator-sessions.qdoc b/doc/src/howto/creator-only/creator-sessions.qdoc similarity index 100% rename from doc/src/howto/creator-sessions.qdoc rename to doc/src/howto/creator-only/creator-sessions.qdoc diff --git a/doc/src/howto/creator-task-lists.qdoc b/doc/src/howto/creator-only/creator-task-lists.qdoc similarity index 100% rename from doc/src/howto/creator-task-lists.qdoc rename to doc/src/howto/creator-only/creator-task-lists.qdoc diff --git a/doc/src/howto/creator-tips.qdoc b/doc/src/howto/creator-only/creator-tips.qdoc similarity index 100% rename from doc/src/howto/creator-tips.qdoc rename to doc/src/howto/creator-only/creator-tips.qdoc diff --git a/doc/src/howto/creator-ui.qdoc b/doc/src/howto/creator-only/creator-ui.qdoc similarity index 100% rename from doc/src/howto/creator-ui.qdoc rename to doc/src/howto/creator-only/creator-ui.qdoc diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/creator-only/qtcreator-faq.qdoc similarity index 100% rename from doc/src/howto/qtcreator-faq.qdoc rename to doc/src/howto/creator-only/qtcreator-faq.qdoc diff --git a/doc/src/overview/creator-advanced.qdoc b/doc/src/overview/creator-only/creator-advanced.qdoc similarity index 100% rename from doc/src/overview/creator-advanced.qdoc rename to doc/src/overview/creator-only/creator-advanced.qdoc diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-only/creator-commercial-overview.qdoc similarity index 100% rename from doc/src/overview/creator-commercial-overview.qdoc rename to doc/src/overview/creator-only/creator-commercial-overview.qdoc diff --git a/doc/src/overview/creator-configuring.qdoc b/doc/src/overview/creator-only/creator-configuring.qdoc similarity index 100% rename from doc/src/overview/creator-configuring.qdoc rename to doc/src/overview/creator-only/creator-configuring.qdoc diff --git a/doc/src/overview/creator-design-overview.qdoc b/doc/src/overview/creator-only/creator-design-overview.qdoc similarity index 100% rename from doc/src/overview/creator-design-overview.qdoc rename to doc/src/overview/creator-only/creator-design-overview.qdoc diff --git a/doc/src/overview/creator-getting-started.qdoc b/doc/src/overview/creator-only/creator-getting-started.qdoc similarity index 100% rename from doc/src/overview/creator-getting-started.qdoc rename to doc/src/overview/creator-only/creator-getting-started.qdoc diff --git a/doc/src/overview/creator-glossary.qdoc b/doc/src/overview/creator-only/creator-glossary.qdoc similarity index 100% rename from doc/src/overview/creator-glossary.qdoc rename to doc/src/overview/creator-only/creator-glossary.qdoc diff --git a/doc/src/overview/creator-help-overview.qdoc b/doc/src/overview/creator-only/creator-help-overview.qdoc similarity index 96% rename from doc/src/overview/creator-help-overview.qdoc rename to doc/src/overview/creator-only/creator-help-overview.qdoc index 70eba62c41e..dd8c47dc251 100644 --- a/doc/src/overview/creator-help-overview.qdoc +++ b/doc/src/overview/creator-only/creator-help-overview.qdoc @@ -32,11 +32,7 @@ /*! \contentspage index.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-issues.qdoc b/doc/src/overview/creator-only/creator-issues.qdoc similarity index 100% rename from doc/src/overview/creator-issues.qdoc rename to doc/src/overview/creator-only/creator-issues.qdoc diff --git a/doc/src/overview/creator-overview.qdoc b/doc/src/overview/creator-only/creator-overview.qdoc similarity index 100% rename from doc/src/overview/creator-overview.qdoc rename to doc/src/overview/creator-only/creator-overview.qdoc diff --git a/doc/src/overview/creator-supported-platforms.qdoc b/doc/src/overview/creator-only/creator-supported-platforms.qdoc similarity index 98% rename from doc/src/overview/creator-supported-platforms.qdoc rename to doc/src/overview/creator-only/creator-supported-platforms.qdoc index d6b95f77601..1e44a792d3a 100644 --- a/doc/src/overview/creator-supported-platforms.qdoc +++ b/doc/src/overview/creator-only/creator-supported-platforms.qdoc @@ -123,5 +123,5 @@ To build \QC from the source, see the requirements and instructions in the readme file that is located in the source repository. - \include overview/creator-target-platforms.qdocinc target platforms + \include creator-target-platforms.qdocinc target platforms */ diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-only/creator-target-platforms.qdocinc similarity index 100% rename from doc/src/overview/creator-target-platforms.qdocinc rename to doc/src/overview/creator-only/creator-target-platforms.qdocinc diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-only/creator-tech-support.qdoc similarity index 100% rename from doc/src/overview/creator-tech-support.qdoc rename to doc/src/overview/creator-only/creator-tech-support.qdoc diff --git a/doc/src/overview/creator-testing.qdoc b/doc/src/overview/creator-only/creator-testing.qdoc similarity index 100% rename from doc/src/overview/creator-testing.qdoc rename to doc/src/overview/creator-only/creator-testing.qdoc diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-only/creator-tutorials.qdoc similarity index 100% rename from doc/src/overview/creator-tutorials.qdoc rename to doc/src/overview/creator-only/creator-tutorials.qdoc diff --git a/doc/src/overview/mobile-app-design.qdoc b/doc/src/overview/creator-only/mobile-app-design.qdoc similarity index 100% rename from doc/src/overview/mobile-app-design.qdoc rename to doc/src/overview/creator-only/mobile-app-design.qdoc diff --git a/doc/src/projects/creator-projects-autotools.qdoc b/doc/src/projects/creator-only/creator-projects-autotools.qdoc similarity index 100% rename from doc/src/projects/creator-projects-autotools.qdoc rename to doc/src/projects/creator-only/creator-projects-autotools.qdoc diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc similarity index 100% rename from doc/src/projects/creator-projects-build-run-tutorial.qdoc rename to doc/src/projects/creator-only/creator-projects-build-run-tutorial.qdoc diff --git a/doc/src/projects/creator-projects-build-systems.qdocinc b/doc/src/projects/creator-only/creator-projects-build-systems.qdocinc similarity index 100% rename from doc/src/projects/creator-projects-build-systems.qdocinc rename to doc/src/projects/creator-only/creator-projects-build-systems.qdocinc diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-only/creator-projects-building-running.qdoc similarity index 100% rename from doc/src/projects/creator-projects-building-running.qdoc rename to doc/src/projects/creator-only/creator-projects-building-running.qdoc diff --git a/doc/src/projects/creator-projects-building.qdoc b/doc/src/projects/creator-only/creator-projects-building.qdoc similarity index 100% rename from doc/src/projects/creator-projects-building.qdoc rename to doc/src/projects/creator-only/creator-projects-building.qdoc diff --git a/doc/src/projects/creator-projects-builds-customizing.qdoc b/doc/src/projects/creator-only/creator-projects-builds-customizing.qdoc similarity index 100% rename from doc/src/projects/creator-projects-builds-customizing.qdoc rename to doc/src/projects/creator-only/creator-projects-builds-customizing.qdoc diff --git a/doc/src/projects/creator-projects-compilers.qdoc b/doc/src/projects/creator-only/creator-projects-compilers.qdoc similarity index 100% rename from doc/src/projects/creator-projects-compilers.qdoc rename to doc/src/projects/creator-only/creator-projects-compilers.qdoc diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-only/creator-projects-creating.qdoc similarity index 100% rename from doc/src/projects/creator-projects-creating.qdoc rename to doc/src/projects/creator-only/creator-projects-creating.qdoc diff --git a/doc/src/projects/creator-projects-custom-wizards-json.qdoc b/doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc similarity index 100% rename from doc/src/projects/creator-projects-custom-wizards-json.qdoc rename to doc/src/projects/creator-only/creator-projects-custom-wizards-json.qdoc diff --git a/doc/src/projects/creator-projects-custom-wizards-xml.qdoc b/doc/src/projects/creator-only/creator-projects-custom-wizards-xml.qdoc similarity index 100% rename from doc/src/projects/creator-projects-custom-wizards-xml.qdoc rename to doc/src/projects/creator-only/creator-projects-custom-wizards-xml.qdoc diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-only/creator-projects-custom-wizards.qdoc similarity index 100% rename from doc/src/projects/creator-projects-custom-wizards.qdoc rename to doc/src/projects/creator-only/creator-projects-custom-wizards.qdoc diff --git a/doc/src/projects/creator-projects-debuggers.qdoc b/doc/src/projects/creator-only/creator-projects-debuggers.qdoc similarity index 100% rename from doc/src/projects/creator-projects-debuggers.qdoc rename to doc/src/projects/creator-only/creator-projects-debuggers.qdoc diff --git a/doc/src/projects/creator-projects-generic.qdoc b/doc/src/projects/creator-only/creator-projects-generic.qdoc similarity index 100% rename from doc/src/projects/creator-projects-generic.qdoc rename to doc/src/projects/creator-only/creator-projects-generic.qdoc diff --git a/doc/src/projects/creator-projects-libraries.qdoc b/doc/src/projects/creator-only/creator-projects-libraries.qdoc similarity index 100% rename from doc/src/projects/creator-projects-libraries.qdoc rename to doc/src/projects/creator-only/creator-projects-libraries.qdoc diff --git a/doc/src/projects/creator-projects-opening.qdoc b/doc/src/projects/creator-only/creator-projects-opening.qdoc similarity index 100% rename from doc/src/projects/creator-projects-opening.qdoc rename to doc/src/projects/creator-only/creator-projects-opening.qdoc diff --git a/doc/src/projects/creator-projects-other.qdoc b/doc/src/projects/creator-only/creator-projects-other.qdoc similarity index 100% rename from doc/src/projects/creator-projects-other.qdoc rename to doc/src/projects/creator-only/creator-projects-other.qdoc diff --git a/doc/src/projects/creator-projects-overview.qdoc b/doc/src/projects/creator-only/creator-projects-overview.qdoc similarity index 100% rename from doc/src/projects/creator-projects-overview.qdoc rename to doc/src/projects/creator-only/creator-projects-overview.qdoc diff --git a/doc/src/projects/creator-projects-qbs.qdoc b/doc/src/projects/creator-only/creator-projects-qbs.qdoc similarity index 100% rename from doc/src/projects/creator-projects-qbs.qdoc rename to doc/src/projects/creator-only/creator-projects-qbs.qdoc diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-only/creator-projects-qt-versions.qdoc similarity index 100% rename from doc/src/projects/creator-projects-qt-versions.qdoc rename to doc/src/projects/creator-only/creator-projects-qt-versions.qdoc diff --git a/doc/src/projects/creator-projects-settings-build-qbs.qdocinc b/doc/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc similarity index 100% rename from doc/src/projects/creator-projects-settings-build-qbs.qdocinc rename to doc/src/projects/creator-only/creator-projects-settings-build-qbs.qdocinc diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-only/creator-projects-settings-build.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-build.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-build.qdoc diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-code-style.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-code-style.qdoc diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-only/creator-projects-settings-dependencies.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-dependencies.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-dependencies.qdoc diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-only/creator-projects-settings-editor.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-editor.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-editor.qdoc diff --git a/doc/src/projects/creator-projects-settings-overview.qdoc b/doc/src/projects/creator-only/creator-projects-settings-overview.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-overview.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-overview.qdoc diff --git a/doc/src/projects/creator-projects-settings-sharing.qdoc b/doc/src/projects/creator-only/creator-projects-settings-sharing.qdoc similarity index 100% rename from doc/src/projects/creator-projects-settings-sharing.qdoc rename to doc/src/projects/creator-only/creator-projects-settings-sharing.qdoc diff --git a/doc/src/qtquick/creator-mobile-app-tutorial.qdoc b/doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc similarity index 100% rename from doc/src/qtquick/creator-mobile-app-tutorial.qdoc rename to doc/src/qtquick/creator-only/creator-mobile-app-tutorial.qdoc diff --git a/doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc b/doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc similarity index 100% rename from doc/src/qtquick/creator-tutorial-create-qq-project.qdocinc rename to doc/src/qtquick/creator-only/creator-tutorial-create-qq-project.qdocinc diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/creator-only/qtquick-app-development.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-app-development.qdoc rename to doc/src/qtquick/creator-only/qtquick-app-development.qdoc diff --git a/doc/src/qtquick/qtquick-app-tutorial.qdoc b/doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-app-tutorial.qdoc rename to doc/src/qtquick/creator-only/qtquick-app-tutorial.qdoc diff --git a/doc/src/qtquick/qtquick-buttons.qdoc b/doc/src/qtquick/creator-only/qtquick-buttons.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-buttons.qdoc rename to doc/src/qtquick/creator-only/qtquick-buttons.qdoc diff --git a/doc/src/qtquick/qtquick-connection-editor-backend.qdoc b/doc/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-connection-editor-backend.qdoc rename to doc/src/qtquick/creator-only/qtquick-connection-editor-backend.qdoc diff --git a/doc/src/qtquick/qtquick-creating.qdoc b/doc/src/qtquick/creator-only/qtquick-creating.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-creating.qdoc rename to doc/src/qtquick/creator-only/qtquick-creating.qdoc diff --git a/doc/src/qtquick/qtquick-exporting-qml.qdoc b/doc/src/qtquick/creator-only/qtquick-exporting-qml.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-exporting-qml.qdoc rename to doc/src/qtquick/creator-only/qtquick-exporting-qml.qdoc diff --git a/doc/src/qtquick/qtquick-modules-with-plugins.qdoc b/doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc similarity index 100% rename from doc/src/qtquick/qtquick-modules-with-plugins.qdoc rename to doc/src/qtquick/creator-only/qtquick-modules-with-plugins.qdoc