Doc: move options to a new Build & Run category

Move General settings (from Projects) Tool Chains, Qt Versions,
and CMake settings

Task-number: QTCREATORBUG-6327
Task-number: QTCREATORBUG-6326
Task-number: QTCREATORBUG-6307
Change-Id: I87b2238ac0b44f56363c85366157ae70ac694211
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc
index 712dc02a4a..4d84e9cef2 100644
--- a/doc/src/projects/creator-projects-qt-versions.qdoc
+++ b/doc/src/projects/creator-projects-qt-versions.qdoc
@@ -48,7 +48,7 @@
     \QC automatically detects the Qt versions that are registered by
     your system or by \QSDK. To view the settings for each Qt version, move the
     mouse pointer over it in the list. To add Qt versions, select
-    \gui {Tools > Options > Qt4 > Qt Versions}.
+    \gui {Tools > Options > Build & Run > Qt Versions}.
 
     Typically, you select the Qt versions for a project when you use project
     wizards to create the project. You can add Qt versions for a project in
@@ -60,16 +60,16 @@
 
         \list 1
 
-            \o  Select \gui Tools > \gui Options > \gui Qt4 > \gui Add.
+            \o  Select \gui {Tools > Options > Build & Run > Qt Versions > Add}.
 
                 \image qtcreator-qt4-qtversions-add.png
 
-            \o  In the \gui{qmake location} field, enter the path to the
-                directory where the qmake executable is located.
-
             \o  In the \gui{Version name} field, edit the name that \QC
                 suggests for the Qt version.
 
+            \o  In the \gui{qmake location} field, enter the path to the
+                directory where the qmake executable is located.
+
                 \QC automatically determines the path to the binaries in
                 the Qt installation and displays it in the dialog.