diff options
author | con <qtc-committer@nokia.com> | 2008-12-15 16:26:18 +0100 |
---|---|---|
committer | con <qtc-committer@nokia.com> | 2008-12-15 16:28:07 +0100 |
commit | 9b39f38f95326d5d5aee0abd196f641449770cd1 (patch) | |
tree | fb6b86cc81e22c2eeb28f33a2dfb4ae83fabcd15 | |
parent | e467cca6f60bfdee737b81a5d89e4f69bf3af1f1 (diff) |
Fixes: - Doc update of Build Settings
Details: - Screenshots and some changes regarding the different
handling of Custom Display of Qt Objects.
-rw-r--r-- | doc/qtcreator-buildenvironment.png | bin | 98411 -> 276475 bytes | |||
-rw-r--r-- | doc/qtcreator-buildsettingstab.png | bin | 73430 -> 209989 bytes | |||
-rw-r--r-- | doc/qtcreator-buildsteps.png | bin | 81336 -> 223111 bytes | |||
-rw-r--r-- | doc/qtcreator.qch | bin | 1911808 -> 2407424 bytes | |||
-rw-r--r-- | doc/qtcreator.qdoc | 26 |
5 files changed, 11 insertions, 15 deletions
diff --git a/doc/qtcreator-buildenvironment.png b/doc/qtcreator-buildenvironment.png Binary files differindex fb9af43b0e..d4ed451165 100644 --- a/doc/qtcreator-buildenvironment.png +++ b/doc/qtcreator-buildenvironment.png diff --git a/doc/qtcreator-buildsettingstab.png b/doc/qtcreator-buildsettingstab.png Binary files differindex c6768cda63..872af00441 100644 --- a/doc/qtcreator-buildsettingstab.png +++ b/doc/qtcreator-buildsettingstab.png diff --git a/doc/qtcreator-buildsteps.png b/doc/qtcreator-buildsteps.png Binary files differindex 7e23662faf..c517c2481a 100644 --- a/doc/qtcreator-buildsteps.png +++ b/doc/qtcreator-buildsteps.png diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch Binary files differindex 204b224fd1..1245104481 100644 --- a/doc/qtcreator.qch +++ b/doc/qtcreator.qch diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index ae7bcd8e5e..0abaa3bfc4 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -202,30 +202,23 @@ To modify the build settings of your project, switch to the \gui{Projects} mode using the mouse or with \key{Ctrl+4}. - \image qtcreator-buildsettings.png + \image qtcreator-buildsettingstab.png Action items to create, clone, or delete build configurations can be found - on the right of the dialog. You can have as many build configurations as + at the bottom of the dialog. You can have as many build configurations as needed. By default Qt Creator creates a \bold{debug} and \bold{release} build configuration. Both these configurations use the \l{glossary-default-qt}{Default Qt Version}. In the tree on the left, a list of build configurations and their settings - are displayed. The screenshot below shows the \bold{debug} and + are displayed. The screenshot above shows the \bold{debug} and \bold{release} configurations and their corresponding settings: \bold{Build Environment} and \bold{Build Steps}. - \image qtcreator-buildsettingstab.png - When you select a build configuration in the tree, a configuration page for general build settings will be displayed. Here you can specify which \l{glossary-project-qt}{Qt version} to use to build your project, whether - to \l{glossary-shadow-build}{shadow build} the project, and if a special - debugging helper is linked into the project or not. - - The debugging helper enables the gdb integration to show the contents of - Qt data types. Enabling this option means that an additional file will be - compiled and linked to your project. + to \l{glossary-shadow-build}{shadow build} the project. \image qtcreator-buildenvironment.png @@ -242,11 +235,14 @@ \bold{Build Settings} page. Qt Creator will run the make command using the correct Qt version. - \note The default qmake arguments \c{-after SOURCES*=gdbmacros.cpp - -after QT*=network} are due to the debugging helper described above. If the + \note The \bold{Gdb Macros Build} step builds a small library along with your + project that is used for the custom display of Qt and STL objects in the + integrated debugger. The library is created and built in a "qtc-gdbmacros" + subfolder of your project's main directory, and loaded dynamically into your + application if you run it in the debugger. If the debugging helper seems to break your build or your application, you can - turn it off. You will still be able to debug applications, but the contents - of Qt data types will not be displayed properly. + remove the build step. You will still be able to debug applications, but the + contents of Qt and STL data types will not be displayed properly. \section1 Qt Version Management |