diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2010-08-23 16:31:43 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@nokia.com> | 2010-08-23 16:31:43 +0200 |
commit | 849b91e574f1e1e2be5a69f1d90c2acc8b952a3f (patch) | |
tree | 9f105619496371a1c65d0d209638e3d1a212ef7b /doc/qtcreator.qdoc | |
parent | ef1e52dfd1008549a80e0e326ea339dac195ec8a (diff) | |
parent | c82796247c2c2dc35c8dc5f7f5444cde2321e513 (diff) | |
download | qt-creator-849b91e574f1e1e2be5a69f1d90c2acc8b952a3f.tar.gz |
Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline
Merge latest changes of master into merge :)
Conflicts:
doc/qtcreator.qdoc
Diffstat (limited to 'doc/qtcreator.qdoc')
-rw-r--r-- | doc/qtcreator.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index b71edcbe92..46dd8ed0d8 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -4685,7 +4685,7 @@ with Qt Creator, but they enhance the user's ability to quickly examine complex data significantly. - \section1 Debugging Helpers Based on C++ + \section1 Debugging Helpers based on C++ This is the first and original approach to display complex data types. While it has been superseded on most platforms by the more @@ -4704,7 +4704,7 @@ library is built for each Qt version. - \section1 Debugging Helpers Based on Python + \section1 Debugging Helpers based on Python On platforms featuring a Python-enabled version of the gdb debugger, the data extraction is done by a Python script. This is more robust |