feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Use defines in navigation links

Browse Source 
To be able to build Qt Creator Manual and Qt Design Studio Manual
from the same sources.

Change-Id: I6adbc7b7f23c40f24508a8de7ae9ad5a2a3a103e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Leena Miettinen
2018-08-10 16:15:05 +02:00
parent b70f2b2a69
commit 8828d79c4a
25 changed files with 140 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/src/analyze/qtquick-profiler.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-analyze-mode.html
\page creator-qml-performance-monitor.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 \nextpage creator-valgrind-overview.html
\endif
\title Profiling QML Applications \title Profiling QML Applications

6
doc/src/android/androiddev.qdoc
View File

@@ -26,9 +26,13 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-connecting-mobile.html
\page creator-developing-android.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 \nextpage creator-developing-baremetal.html
\endif
\title Connecting Android Devices \title Connecting Android Devices

7
doc/src/debugger/creator-debugger.qdoc
View File

@@ -353,9 +353,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-debugger-operating-modes.html
\page creator-debug-mode.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 \nextpage creator-debugging-helpers.html
\endif
\title Interacting with the Debugger \title Interacting with the Debugger

7
doc/src/debugger/qtquick-debugger-example.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-debugging-example.html
\page creator-qml-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 \nextpage creator-troubleshooting-debugging.html
\endif
\title Debugging a Qt Quick Example Application \title Debugging a Qt Quick Example Application

7
doc/src/debugger/qtquick-debugging.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-debugging-helpers.html
\page creator-debugging-qml.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 \nextpage creator-debugging-example.html
\endif
\title Debugging Qt Quick Projects \title Debugging Qt Quick Projects

7
doc/src/editors/creator-coding.qdoc
View File

@@ -31,8 +31,13 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-usability.html
\page creator-coding.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 \nextpage creator-editor-functions.html
\title Coding \title Coding

6
doc/src/editors/creator-editors-options-text.qdoc
View File

@@ -31,9 +31,13 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-editor-options.html
\page creator-editor-options-text.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 \nextpage creator-editor-fakevim.html
\endif
\title Specifying Text Editor Settings \title Specifying Text Editor Settings

7
doc/src/howto/creator-keyboard-shortcuts.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-cli.html
\page creator-keyboard-shortcuts.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 \nextpage creator-editor-external.html
\endif
\title Keyboard Shortcuts \title Keyboard Shortcuts

6
doc/src/linux-mobile/creator-deployment-embedded-linux.qdoc
View File

@@ -31,9 +31,13 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-deploying-android.html
\page creator-deployment-embedded-linux.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 \nextpage creator-deployment-qnx.html
\endif
\title Deploying Applications to Embedded Linux Devices \title Deploying Applications to Embedded Linux Devices

7
doc/src/linux-mobile/linuxdev.qdoc
View File

@@ -26,9 +26,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-developing-baremetal.html
\page creator-developing-generic-linux.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 \nextpage creator-developing-ios.html
\endif
\title Connecting Embedded Linux Devices \title Connecting Embedded Linux Devices

6
doc/src/overview/creator-help-overview.qdoc
View File

@@ -31,8 +31,12 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-task-lists.html
\page creator-help-overview.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 \nextpage creator-help.html
\title Getting Help \title Getting Help

6
doc/src/overview/creator-mobile-targets.qdoc
View File

@@ -31,8 +31,12 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-deployment-qnx.html
\page creator-connecting-mobile.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 \nextpage creator-developing-android.html
\title Connecting Devices \title Connecting Devices

7
doc/src/projects/creator-projects-builds-customizing.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-developing-qnx.html
\page creator-build-process-customizing.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 \nextpage creator-testing.html
\endif
\title Customizing the Build Process \title Customizing the Build Process

6
doc/src/projects/creator-projects-running.qdoc
View File

@@ -31,8 +31,12 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-building-targets.html
\page creator-running-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 \nextpage creator-deployment.html
\title Running on Multiple Platforms \title Running on Multiple Platforms

6
doc/src/projects/creator-projects-settings-dependencies.qdoc
View File

@@ -31,9 +31,13 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-code-style-settings.html
\page creator-build-dependencies.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 \nextpage creator-sharing-project-settings.html
\endif
\title Specifying Dependencies \title Specifying Dependencies

7
doc/src/qtquick/qtquick-components.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-using-qt-quick-designer.html
\page quick-components.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 \nextpage quick-buttons.html
\endif
\title Creating Components \title Creating Components

6
doc/src/qtquick/qtquick-connection-editor-bindings.qdoc
View File

@@ -25,9 +25,13 @@
/*! /*!
\contentspage {Qt Creator Manual} \contentspage {Qt Creator Manual}
\previouspage quick-dynamic-properties.html
\page quick-property-bindings.html \page quick-property-bindings.html
\previouspage quick-dynamic-properties.html
\if defined(qtdesignstudio)
\nextpage quick-states.html
\else
\nextpage quick-connections-backend.html \nextpage quick-connections-backend.html
\endif
\title Adding Bindings Between Properties \title Adding Bindings Between Properties

7
doc/src/qtquick/qtquick-designer.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-quick-ui-forms.html
\page creator-using-qt-quick-designer.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 \nextpage quick-components.html
\endif
\title Editing QML Files in Design Mode \title Editing QML Files in Design Mode

7
doc/src/qtquick/qtquick-iso-icon-browser.qdoc
View File

@@ -25,9 +25,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage quick-states.html
\page qtquick-iso-icon-browser.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 \nextpage quick-export-to-qml.html
\endif
\title Browsing ISO 7000 Icons \title Browsing ISO 7000 Icons

6
doc/src/qtquick/qtquick-navigator.qdoc
View File

@@ -25,8 +25,12 @@
/*! /*!
\contentspage {Qt Creator Manual} \contentspage {Qt Creator Manual}
\previouspage quick-scalable-image.html
\page qtquick-navigator.html \page qtquick-navigator.html
\if defined(qtdesignstudio)
\previouspage quick-components.html
\else
\previouspage quick-scalable-image.html
\endif
\nextpage qtquick-properties.html \nextpage qtquick-properties.html
\title Managing Item Hierarchy \title Managing Item Hierarchy

7
doc/src/qtquick/qtquick-pathview-editor.qdoc
View File

@@ -25,9 +25,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage qtquick-properties.html
\page qmldesigner-pathview-editor.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 \nextpage qmldesigner-connections.html
\endif
\title Editing PathView Properties \title Editing PathView Properties

6
doc/src/qtquick/qtquick-properties.qdoc
View File

@@ -25,9 +25,13 @@
/*! /*!
\contentspage {Qt Creator Manual} \contentspage {Qt Creator Manual}
\previouspage qtquick-navigator.html
\page qtquick-properties.html \page qtquick-properties.html
\previouspage qtquick-navigator.html
\if defined(qtdesignstudio)
\nextpage studio-timeline.html
\else
\nextpage qmldesigner-pathview-editor.html \nextpage qmldesigner-pathview-editor.html
\endif
\title Specifying Item Properties \title Specifying Item Properties

7
doc/src/qtquick/qtquick-states.qdoc
View File

@@ -25,9 +25,14 @@
/*! /*!
\contentspage {Qt Creator Manual} \contentspage {Qt Creator Manual}
\previouspage quick-connections-backend.html
\page quick-states.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 \nextpage qtquick-iso-icon-browser.html
\endif
\title Adding States \title Adding States

7
doc/src/qtquick/qtquick-ui-forms.qdoc
View File

@@ -32,9 +32,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage quick-projects.html
\page creator-quick-ui-forms.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 \nextpage creator-using-qt-quick-designer.html
\endif
\title Qt Quick UI Forms \title Qt Quick UI Forms

7
doc/src/vcs/creator-vcs-git.qdoc
View File

@@ -31,9 +31,14 @@
/*! /*!
\contentspage index.html \contentspage index.html
\previouspage creator-vcs-cvs.html
\page creator-vcs-git.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 \nextpage creator-vcs-mercurial.html
\endif
\title Using Git \title Using Git