aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2017-08-03 17:02:05 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2017-08-07 08:08:51 +0000
commita8d81153e8e4a0e64713b8e1d157092206ceaedf (patch)
treebf613b9d860c791602aae2d8c622714f89f2a2da /doc
parent836f54e3b6980b67fb77c36bbcd6dd05773a74cf (diff)
Doc: Reflect changes in the Projects view
These changes were already made in 4.3. Change-Id: Ic5be8b9d24ca8f0fb7a2ab5176d312fb9f2a2251 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qtcreator-build-dependencies.pngbin6571 -> 8470 bytes
-rw-r--r--doc/images/qtcreator-editor-settings.pngbin24066 -> 70636 bytes
-rw-r--r--doc/src/projects/creator-projects-settings-code-style.qdoc6
-rw-r--r--doc/src/projects/creator-projects-settings-dependencies.qdoc5
-rw-r--r--doc/src/projects/creator-projects-settings-editor.qdoc3
5 files changed, 8 insertions, 6 deletions
diff --git a/doc/images/qtcreator-build-dependencies.png b/doc/images/qtcreator-build-dependencies.png
index 62db9b21ac..b67341f94f 100644
--- a/doc/images/qtcreator-build-dependencies.png
+++ b/doc/images/qtcreator-build-dependencies.png
Binary files differ
diff --git a/doc/images/qtcreator-editor-settings.png b/doc/images/qtcreator-editor-settings.png
index 583af66502..81b4af6a39 100644
--- a/doc/images/qtcreator-editor-settings.png
+++ b/doc/images/qtcreator-editor-settings.png
Binary files differ
diff --git a/doc/src/projects/creator-projects-settings-code-style.qdoc b/doc/src/projects/creator-projects-settings-code-style.qdoc
index e2665f8540..8479124a00 100644
--- a/doc/src/projects/creator-projects-settings-code-style.qdoc
+++ b/doc/src/projects/creator-projects-settings-code-style.qdoc
@@ -58,9 +58,11 @@
\list 1
- \li Select \uicontrol Projects > \uicontrol {Code Style}.
+ \li Select \uicontrol Projects > \uicontrol {Project Settings} >
+ \uicontrol {Code Style}.
- \li In the \uicontrol Language field, select \uicontrol C++ or \uicontrol {Qt Quick}.
+ \li In the \uicontrol Language field, select \uicontrol C++,
+ \uicontrol {Qt Quick}, or \uicontrol Nim.
\li In the \uicontrol {Current settings} field, select the settings to modify
and click \uicontrol Copy.
diff --git a/doc/src/projects/creator-projects-settings-dependencies.qdoc b/doc/src/projects/creator-projects-settings-dependencies.qdoc
index d1c9b20b50..51c2c7f0a4 100644
--- a/doc/src/projects/creator-projects-settings-dependencies.qdoc
+++ b/doc/src/projects/creator-projects-settings-dependencies.qdoc
@@ -51,9 +51,8 @@
\list 1
- \li In \uicontrol Projects, select a project.
-
- \li Click \uicontrol Dependencies.
+ \li Select \uicontrol Projects > \uicontrol {Project Settings} >
+ \uicontrol Dependencies.
\li Select projects that must be built before the current project is
built.
diff --git a/doc/src/projects/creator-projects-settings-editor.qdoc b/doc/src/projects/creator-projects-settings-editor.qdoc
index c2b8a108bd..c3ea91b00d 100644
--- a/doc/src/projects/creator-projects-settings-editor.qdoc
+++ b/doc/src/projects/creator-projects-settings-editor.qdoc
@@ -50,7 +50,8 @@
\list 1
- \li Select \uicontrol Projects > \uicontrol Editor.
+ \li Select \uicontrol Projects > \uicontrol {Project Settings} >
+ \uicontrol Editor.
\li In the \uicontrol {Editor settings} field, select \uicontrol {Custom}.