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>

13 files changed, 28 insertions, 34 deletions

diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png
index b6f8f3a921..8a3e4b3e6d 100644
--- a/doc/images/qtcreator-cmakeexecutable.png
+++ b/doc/images/qtcreator-cmakeexecutable.png
diff --git a/doc/images/qtcreator-project-options-deploy.png b/doc/images/qtcreator-project-options-deploy.png
index e3af5b7a2f..8903c9c634 100644
--- a/doc/images/qtcreator-project-options-deploy.png
+++ b/doc/images/qtcreator-project-options-deploy.png
diff --git a/doc/images/qtcreator-qt4-qtversions-add.png b/doc/images/qtcreator-qt4-qtversions-add.png
index 2fc17c9fd5..6c512d30f5 100644
--- a/doc/images/qtcreator-qt4-qtversions-add.png
+++ b/doc/images/qtcreator-qt4-qtversions-add.png
diff --git a/doc/images/qtcreator-qt4-qtversions-win-symbian.png b/doc/images/qtcreator-qt4-qtversions-win-symbian.png
index 3847a3a678..785e9e9b5d 100644
--- a/doc/images/qtcreator-qt4-qtversions-win-symbian.png
+++ b/doc/images/qtcreator-qt4-qtversions-win-symbian.png
diff --git a/doc/images/qtcreator-toolchains.png b/doc/images/qtcreator-toolchains.png
index 510ae06767..2455ecab49 100644
--- a/doc/images/qtcreator-toolchains.png
+++ b/doc/images/qtcreator-toolchains.png
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 8359763b2e..5eac8c44fa 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -594,7 +594,8 @@
             codesign -f -s "$USER" $INSTALL_LOCATION/fsfgdb
             \endcode
 
-        \o  In \QC, select \gui {Tools > Preferences… > Tool Chains}, to
+        \o  In \QC, select \gui {Qt Creator > Preferences > Build & Run >
+            Tool Chains}, to
             add a tool chain that uses the debugger:
 
         \list 1
@@ -1003,8 +1004,8 @@
     \QC dynamically loads a helper library in form of a DLL or a
     shared object into the debugged process.
     The \QSDK package already contains a prebuilt debugging helper
-    library. To create your own debugging helper library, select \gui{Tools} >
-    \gui{Options} > \gui{Qt4} > \gui{Qt Versions}. As the internal data
+    library. To create your own debugging helper library, select \gui{Tools >
+    Options > Build & Run > Qt Versions}. As the internal data
     structures of Qt can change between versions, the debugging helper
     library is built for each Qt version.
 
@@ -1311,7 +1312,7 @@
 
     You have to build the QML Inspector once for each Qt version that you want
     to debug
-    with. Select \gui{Tools > Options > Qt4 > Qt Versions}.
+    with. Select \gui{Tools > Options > Build & Run > Qt Versions}.
 
     \note QML Inspector requires Qt 4.7.1 or later.
 
diff --git a/doc/src/linux-mobile/linuxdev.qdoc b/doc/src/linux-mobile/linuxdev.qdoc
index 66c654767b..00d3b30bb9 100644
--- a/doc/src/linux-mobile/linuxdev.qdoc
+++ b/doc/src/linux-mobile/linuxdev.qdoc
@@ -54,10 +54,12 @@
 
         \o  Make sure that your device can be reached via an IP address.
 
-        \o  Select \gui {Tools > Options > Qt4 > Add} to add the Qt version
+        \o  Select \gui {Tools > Options > Build & Run > Qt Versions > Add} to
+            add the Qt version
             for the generic Linux.
 
-        \o  Select \gui {Tools > Options > Tool Chains > Add} to add the tool
+        \o  Select \gui {Tools > Options > Build & Run > Tool Chains > Add} to
+            add the tool
             chain for building the applications.
 
         \o  To deploy applications and run them remotely on devices, specify
diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc
index d338df09ba..860d929d59 100644
--- a/doc/src/projects/creator-projects-cmake.qdoc
+++ b/doc/src/projects/creator-projects-cmake.qdoc
@@ -45,7 +45,7 @@
     \section1 Setting the Path for CMake
 
     You can set the path for the \c CMake executable in \gui{Tools} >
-    \gui{Options > Projects > CMake}.
+    \gui{Options > Build & Run > CMake}.
 
     \image qtcreator-cmakeexecutable.png
 
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index 239a763d41..145b52a503 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -102,7 +102,7 @@
 
     To change the location of the project directory, and to specify settings
     for building and running projects, select \gui{Tools} > \gui{Options} >
-    \gui{Projects} > \gui{General}.
+    \gui{Build & Run} > \gui{General}.
 
     To specify build and run settings for different target platforms, select
     \gui Projects.
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.
 
diff --git a/doc/src/projects/creator-projects-tool-chains.qdoc b/doc/src/projects/creator-projects-tool-chains.qdoc
index a89d298a4e..7d181a0563 100644
--- a/doc/src/projects/creator-projects-tool-chains.qdoc
+++ b/doc/src/projects/creator-projects-tool-chains.qdoc
@@ -83,7 +83,8 @@
 
     \list 1
 
-        \o  Select \gui {Tools > Options Tool Chains > Add} and select a
+        \o  Select \gui {Tools > Options > Build & Run > Tool Chains > Add} and
+            select a
             compiler in the list.
 
             \image qtcreator-toolchains.png
diff --git a/doc/src/projects/creator-remote-compiler.qdoc b/doc/src/projects/creator-remote-compiler.qdoc
index 043ef1993c..1fefad9de4 100644
--- a/doc/src/projects/creator-remote-compiler.qdoc
+++ b/doc/src/projects/creator-remote-compiler.qdoc
@@ -55,7 +55,7 @@
         \o  In the \gui {Package Manager}, select \gui {Experimental >
             Remote Compiler} to install Remote Compiler.
 
-        \o  In \QC, choose \gui {Tools > Options > Projects > Remote Compiler}
+        \o  In \QC, choose \gui {Tools > Options > Build & Run > Remote Compiler}
             to log on to Nokia Developer.
 
             \image remotecompiler-fn-logon.png "Remote Compiler options"
diff --git a/doc/src/symbian/creator-projects-qt-versions-symbian.qdocinc b/doc/src/symbian/creator-projects-qt-versions-symbian.qdocinc
index 32a31303d2..5abc29f3bf 100644
--- a/doc/src/symbian/creator-projects-qt-versions-symbian.qdocinc
+++ b/doc/src/symbian/creator-projects-qt-versions-symbian.qdocinc
@@ -3,30 +3,20 @@
     If you install Qt for Symbian as a part of \QSDK, it is automatically
     detected by \QC. If you install other Symbian SDKs and register them
     with devices.exe, \QC automatically detects the Qt version.
+    The \gui {S60 SDK} field displays the path to the directory where
+    the Symbian SDK is located.
 
     If the selected Qt version was built using the SBSv2 build system, that
     is available for Symbian OS 9.5 based SDKs, \QC builds your projects
-    using this build system. The \gui {SBS v2 directory} field is enabled and
-    you must specify the path to the directory where the SBS executable (for
+    using this build system. The \gui {SBS v2 directory} field displays the
+    path to the directory where the SBS executable (for
     example, sbs.bat on Windows) is located.
 
-    To add a Qt for Symbian version:
+    To view Qt for Symbian version settings, select \gui {Tools > Options >
+    Build & Run > Qt Versions}.
 
-    \list 1
+    \image qtcreator-qt4-qtversions-win-symbian.png
 
-        \o  Select \gui Tools > \gui Options > \gui Qt4 > \gui{Qt Versions}.
+    For more information about how to add tool chains for using the GCCE and
+    WINSCW compilers, see \l{Adding Tool Chains}.
 
-        \o  Select the Qt for Symbian version you want the \QC to use.
-
-            \image qtcreator-qt4-qtversions-win-symbian.png
-
-            For more information about how to add tool chains for using the
-            GCCE and WINSCW compilers, see \l{Adding Tool Chains}.
-
-        \o  In the \gui {S60 SDK} field, enter the path to the directory where
-            the Symbian SDK is located.
-
-        \o  In the \gui {SBS v2 directory} field, enter the path to the
-            directory where the SBS v2 executable is located.
-
-    \endlist