diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-14 16:19:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-14 16:19:14 +0200 |
| commit | 42c9c96361f113004fa0af23cfb2164b135f174d (patch) | |
| tree | 98a13a02565b90a205f4b16b8add430543dd6fdf /doc | |
| parent | 54b1770cc90c7ddc06924efc6f54b5d8904075b6 (diff) | |
| parent | 3ac771ecbf6058c69cc966b60fc41a524f53eae7 (diff) | |
| download | qt-creator-42c9c96361f113004fa0af23cfb2164b135f174d.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/qmlprofiler/qmlprofilerengine.cpp
Change-Id: Ic9dc22d2d4a7306cfc4ef0ec158993e3768a9853
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/coding-style.qdoc | 1 | ||||
| -rw-r--r-- | doc/api/external-tool-spec.qdoc | 1 | ||||
| -rw-r--r-- | doc/api/qtcreator-api.qdoc | 1 | ||||
| -rw-r--r-- | doc/api/qtcreator-dev.qdoc | 2 | ||||
| -rw-r--r-- | doc/api/qtcreator-documentation.qdoc | 1 | ||||
| -rw-r--r-- | doc/api/qtcreator-ui-text.qdoc | 1 |
6 files changed, 1 insertions, 6 deletions
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc index a8afd6a398..7ea0f6eec3 100644 --- a/doc/api/coding-style.qdoc +++ b/doc/api/coding-style.qdoc @@ -17,7 +17,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Qt Creator} \previouspage qtcreator-ui-text.html \page coding-style.html \nextpage qtcreator-api.html diff --git a/doc/api/external-tool-spec.qdoc b/doc/api/external-tool-spec.qdoc index a87456d97d..6dd114fad4 100644 --- a/doc/api/external-tool-spec.qdoc +++ b/doc/api/external-tool-spec.qdoc @@ -17,7 +17,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Qt Creator} \page external-tool-spec.html \nextpage coding-style.html diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc index 8dcd8967bd..464e791c5b 100644 --- a/doc/api/qtcreator-api.qdoc +++ b/doc/api/qtcreator-api.qdoc @@ -17,7 +17,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Extending Qt Creator Manual} \page qtcreator-api.html \title Qt Creator API Reference diff --git a/doc/api/qtcreator-dev.qdoc b/doc/api/qtcreator-dev.qdoc index 51eb4bac9b..8a421f35b3 100644 --- a/doc/api/qtcreator-dev.qdoc +++ b/doc/api/qtcreator-dev.qdoc @@ -17,7 +17,7 @@ ****************************************************************************/ /*! - \page index.html + \page extending-index.html \title Extending Qt Creator Manual Qt Creator is a cross-platform integrated development environment (IDE) diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 90fdcda6b7..d89329e2c2 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -17,7 +17,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Qt Creator} \previouspage external-tool-spec.html \page qtcreator-documentation.html \nextpage coding-style.html diff --git a/doc/api/qtcreator-ui-text.qdoc b/doc/api/qtcreator-ui-text.qdoc index a352af2bb7..4ca8091517 100644 --- a/doc/api/qtcreator-ui-text.qdoc +++ b/doc/api/qtcreator-ui-text.qdoc @@ -17,7 +17,6 @@ ****************************************************************************/ /*! - \contentspage{index.html}{Qt Creator} \previouspage external-tool-spec.html \page qtcreator-ui-text.html \nextpage coding-style.html |