summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/editors/creator-coding-edit-mode.qdoc6
-rw-r--r--doc/src/editors/creator-coding.qdoc23
-rw-r--r--doc/src/editors/creator-editors-writing-code.qdoc21
-rw-r--r--doc/src/editors/creator-mime-types.qdoc2
-rw-r--r--doc/src/editors/creator-modeling.qdoc4
-rw-r--r--doc/src/overview/creator-target-platforms.qdocinc2
-rw-r--r--doc/src/projects/creator-projects-building-running.qdoc2
-rw-r--r--doc/src/qtcreator.qdoc5
-rw-r--r--doc/src/qtquick/qtquick-components.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-connection-editor.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-designer.qdoc2
-rw-r--r--doc/src/qtquick/qtquick-pathview-editor.qdoc2
12 files changed, 41 insertions, 32 deletions
diff --git a/doc/src/editors/creator-coding-edit-mode.qdoc b/doc/src/editors/creator-coding-edit-mode.qdoc
index f80aec704d..4693ae1ac4 100644
--- a/doc/src/editors/creator-coding-edit-mode.qdoc
+++ b/doc/src/editors/creator-coding-edit-mode.qdoc
@@ -64,7 +64,11 @@
To show the file encoding of the current file on the editor toolbar (4),
select \uicontrol Tools > \uicontrol Options > \uicontrol {Text Editor} >
- \uicontrol Display > \uicontrol {Display file encoding}.
+ \uicontrol Display > \uicontrol {Display file encoding}. To change the
+ encoding, click it on the toolbar and select new encoding in the
+ \uicontrol {Text Encoding} dialog. To reload the file with the selected
+ encoding, select \uicontrol {Reload with Encoding}. To save the file with
+ the new encoding, select \uicontrol {Save with Encoding}.
\note Other convenient ways of navigating in \QC are provided by the
\l{Searching with the Locator}{locator}, \l{Keyboard Shortcuts}
diff --git a/doc/src/editors/creator-coding.qdoc b/doc/src/editors/creator-coding.qdoc
index 49e6480982..9fcb5e18a8 100644
--- a/doc/src/editors/creator-coding.qdoc
+++ b/doc/src/editors/creator-coding.qdoc
@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-usability.html
\page creator-coding.html
- \nextpage creator-modeling.html
+ \nextpage creator-editor-functions.html
\title Coding
@@ -34,12 +34,6 @@
\list
- \li \l{Modeling}
-
- You can use the experimental model editor to create Universal
- Modeling Language (UML) style models with structured diagrams and
- store them in XML format.
-
\li \l{Writing Code}
Writing, editing, and navigating in source code are core tasks in
@@ -85,18 +79,11 @@
to use for opening the file. If your files do not match the
predefined MIME types, you can edit the MIME types.
- \li \l{Comparing Files}
-
- You can use a diff editor to compare two versions of a file and
- view the differences side-by-side in the \uicontrol Edit mode.
-
- \li \l{Parsing C++ Files}
+ \li \l{Modeling}
- An experimental Clang code model plugin enables you to replace the
- built-in \QC code model with the Clang code model. Clang is a C
- language family front end for LLVM. Clang provides you with more
- accurate information than the built-in code model but can be slower
- to use for large projects.
+ You can use the experimental model editor to create Universal
+ Modeling Language (UML) style models with structured diagrams and
+ store them in XML format.
\endlist
diff --git a/doc/src/editors/creator-editors-writing-code.qdoc b/doc/src/editors/creator-editors-writing-code.qdoc
index d30e89716a..78d1ece352 100644
--- a/doc/src/editors/creator-editors-writing-code.qdoc
+++ b/doc/src/editors/creator-editors-writing-code.qdoc
@@ -24,7 +24,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage creator-modeling.html
+ \previouspage creator-coding.html
\page creator-editor-functions.html
\nextpage creator-coding-navigating.html
@@ -93,4 +93,23 @@
\endlist
+ \section1 Related Topics
+
+ \list
+
+ \li \l{Comparing Files}
+
+ You can use a diff editor to compare two versions of a file and
+ view the differences side-by-side in the \uicontrol Edit mode.
+
+ \li \l{Parsing C++ Files}
+
+ An experimental Clang code model plugin enables you to replace the
+ built-in \QC code model with the Clang code model. Clang is a C
+ language family front end for LLVM. Clang provides you with more
+ accurate information than the built-in code model but can be slower
+ to use for large projects.
+
+ \endlist
+
*/
diff --git a/doc/src/editors/creator-mime-types.qdoc b/doc/src/editors/creator-mime-types.qdoc
index e1f7544a4c..c2f8fff8ba 100644
--- a/doc/src/editors/creator-mime-types.qdoc
+++ b/doc/src/editors/creator-mime-types.qdoc
@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-editor-fakevim.html
\page creator-mime-types.html
- \nextpage creator-building-running.html
+ \nextpage creator-modeling.html
\title Editing MIME Types
diff --git a/doc/src/editors/creator-modeling.qdoc b/doc/src/editors/creator-modeling.qdoc
index 77f9681a24..36200a11d1 100644
--- a/doc/src/editors/creator-modeling.qdoc
+++ b/doc/src/editors/creator-modeling.qdoc
@@ -24,9 +24,9 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage creator-coding.html
+ \previouspage creator-mime-types.html
\page creator-modeling.html
- \nextpage creator-editor-functions.html
+ \nextpage creator-building-running.html
\title Modeling
diff --git a/doc/src/overview/creator-target-platforms.qdocinc b/doc/src/overview/creator-target-platforms.qdocinc
index 34cfdc0a2f..812564c93e 100644
--- a/doc/src/overview/creator-target-platforms.qdocinc
+++ b/doc/src/overview/creator-target-platforms.qdocinc
@@ -29,7 +29,7 @@
For more information about the supported device groups and reference devices,
see \l{http://doc.qt.io/QtForDeviceCreation/qtee-supported-platforms.html}
- {Supported Platforms} in the {http://doc.qt.io/QtForDeviceCreation/index.html}
+ {Supported Platforms} in the \l{http://doc.qt.io/QtForDeviceCreation/index.html}
{Qt for Device Creation} documentation.
\section2 Mobile Devices
diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc
index 047c4764d1..0159b79da3 100644
--- a/doc/src/projects/creator-projects-building-running.qdoc
+++ b/doc/src/projects/creator-projects-building-running.qdoc
@@ -24,7 +24,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage creator-mime-types.html
+ \previouspage creator-modeling.html
\page creator-building-running.html
\nextpage creator-building-targets.html
diff --git a/doc/src/qtcreator.qdoc b/doc/src/qtcreator.qdoc
index 7f33c68dc5..27316fc87c 100644
--- a/doc/src/qtcreator.qdoc
+++ b/doc/src/qtcreator.qdoc
@@ -72,11 +72,11 @@
\endlist
\li \b {\l{Coding}}
\list
- \li \l{Modeling}
\li \l{Writing Code}
\li \l{Finding}
\li \l{Refactoring}
\li \l{Configuring the Editor}
+ \li \l{Modeling}
\endlist
\row
\li \inlineimage creator_buildingrunning.png
@@ -113,7 +113,6 @@
\li \l{Known Issues}
\li \l{Glossary}
\endlist
- \li
\row
\li {4,1} \note To report bugs and suggestions to the Qt Bug
Tracker, select \uicontrol {Help > Report Bug}.
@@ -194,7 +193,6 @@
\endlist
\li \l{Coding}
\list
- \li \l{Modeling}
\li \l{Writing Code}
\list
\li \l{Working in Edit Mode}
@@ -221,6 +219,7 @@
\li \l{Using FakeVim Mode}
\endlist
\li \l{Editing MIME Types}
+ \li \l{Modeling}
\endlist
\li \l{Building and Running}
\list
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 6b946f3de7..86b0a1e36e 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -25,7 +25,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage creator-using-qt-quick-designer.html
+ \previouspage qmldesigner-connections.html
\page quick-components.html
\nextpage quick-buttons.html
diff --git a/doc/src/qtquick/qtquick-connection-editor.qdoc b/doc/src/qtquick/qtquick-connection-editor.qdoc
index f57dc9be21..a84022136e 100644
--- a/doc/src/qtquick/qtquick-connection-editor.qdoc
+++ b/doc/src/qtquick/qtquick-connection-editor.qdoc
@@ -31,7 +31,7 @@
\contentspage {Qt Creator Manual}
\previouspage qmldesigner-pathview-editor.html
\page qmldesigner-connections.html
- \nextpage quick-export-to-qml.html
+ \nextpage quick-components.html
\title Adding Connections
diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc
index 6b8e5cb03e..b9da283ba3 100644
--- a/doc/src/qtquick/qtquick-designer.qdoc
+++ b/doc/src/qtquick/qtquick-designer.qdoc
@@ -26,7 +26,7 @@
\contentspage {Qt Creator Manual}
\previouspage creator-quick-ui-forms.html
\page creator-using-qt-quick-designer.html
- \nextpage quick-components.html
+ \nextpage qmldesigner-pathview-editor.html
\title Using Qt Quick Designer
diff --git a/doc/src/qtquick/qtquick-pathview-editor.qdoc b/doc/src/qtquick/qtquick-pathview-editor.qdoc
index 55424c92ef..8e20f3613d 100644
--- a/doc/src/qtquick/qtquick-pathview-editor.qdoc
+++ b/doc/src/qtquick/qtquick-pathview-editor.qdoc
@@ -29,7 +29,7 @@
/*!
\contentspage {Qt Creator Manual}
- \previouspage creator-qtquick-designer-extensions.html
+ \previouspage creator-using-qt-quick-designer.html
\page qmldesigner-pathview-editor.html
\nextpage qmldesigner-connections.html
View Lorry Controller Status