Commit 3dbe54b0 authored by Leena Miettinen's avatar Leena Miettinen Committed by Eike Ziller

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: default avatarEike Ziller <eike.ziller@nokia.com>
parent 7a1bf412
doc/images/qtcreator-toolchains.png

26.4 KB | W: | H:

doc/images/qtcreator-toolchains.png

26.9 KB | W: | H:

doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
doc/images/qtcreator-toolchains.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -594,7 +594,8 @@ ...@@ -594,7 +594,8 @@
codesign -f -s "$USER" $INSTALL_LOCATION/fsfgdb codesign -f -s "$USER" $INSTALL_LOCATION/fsfgdb
\endcode \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: add a tool chain that uses the debugger:
\list 1 \list 1
...@@ -1003,8 +1004,8 @@ ...@@ -1003,8 +1004,8 @@
\QC dynamically loads a helper library in form of a DLL or a \QC dynamically loads a helper library in form of a DLL or a
shared object into the debugged process. shared object into the debugged process.
The \QSDK package already contains a prebuilt debugging helper The \QSDK package already contains a prebuilt debugging helper
library. To create your own debugging helper library, select \gui{Tools} > library. To create your own debugging helper library, select \gui{Tools >
\gui{Options} > \gui{Qt4} > \gui{Qt Versions}. As the internal data Options > Build & Run > Qt Versions}. As the internal data
structures of Qt can change between versions, the debugging helper structures of Qt can change between versions, the debugging helper
library is built for each Qt version. library is built for each Qt version.
...@@ -1311,7 +1312,7 @@ ...@@ -1311,7 +1312,7 @@
You have to build the QML Inspector once for each Qt version that you want You have to build the QML Inspector once for each Qt version that you want
to debug 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. \note QML Inspector requires Qt 4.7.1 or later.
......
...@@ -54,10 +54,12 @@ ...@@ -54,10 +54,12 @@
\o Make sure that your device can be reached via an IP address. \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. 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. chain for building the applications.
\o To deploy applications and run them remotely on devices, specify \o To deploy applications and run them remotely on devices, specify
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
\section1 Setting the Path for CMake \section1 Setting the Path for CMake
You can set the path for the \c CMake executable in \gui{Tools} > 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 \image qtcreator-cmakeexecutable.png
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
To change the location of the project directory, and to specify settings To change the location of the project directory, and to specify settings
for building and running projects, select \gui{Tools} > \gui{Options} > 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 To specify build and run settings for different target platforms, select
\gui Projects. \gui Projects.
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
\QC automatically detects the Qt versions that are registered by \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 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 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 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 wizards to create the project. You can add Qt versions for a project in
...@@ -60,16 +60,16 @@ ...@@ -60,16 +60,16 @@
\list 1 \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 \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 \o In the \gui{Version name} field, edit the name that \QC
suggests for the Qt version. 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 \QC automatically determines the path to the binaries in
the Qt installation and displays it in the dialog. the Qt installation and displays it in the dialog.
......
...@@ -83,7 +83,8 @@ ...@@ -83,7 +83,8 @@
\list 1 \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. compiler in the list.
\image qtcreator-toolchains.png \image qtcreator-toolchains.png
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
\o In the \gui {Package Manager}, select \gui {Experimental > \o In the \gui {Package Manager}, select \gui {Experimental >
Remote Compiler} to install Remote Compiler. 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. to log on to Nokia Developer.
\image remotecompiler-fn-logon.png "Remote Compiler options" \image remotecompiler-fn-logon.png "Remote Compiler options"
......
...@@ -3,30 +3,20 @@ ...@@ -3,30 +3,20 @@
If you install Qt for Symbian as a part of \QSDK, it is automatically 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 detected by \QC. If you install other Symbian SDKs and register them
with devices.exe, \QC automatically detects the Qt version. 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 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 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 using this build system. The \gui {SBS v2 directory} field displays the
you must specify the path to the directory where the SBS executable (for path to the directory where the SBS executable (for
example, sbs.bat on Windows) is located. 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment