summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-03-02 17:13:33 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-03-02 17:14:19 +0100
commit505256fab9db5ef479ebc69e46191b1a0a605919 (patch)
treedd01d8c8673867c73563566693c46737d097d4e4 /doc
parentb37cd3325cce75a054c3de59b39f1e935b70ef06 (diff)
downloadqt-creator-505256fab9db5ef479ebc69e46191b1a0a605919.tar.gz
API-Documentation: Add the Utils-library.
Fix API after doc template change.
Diffstat (limited to 'doc')
-rw-r--r--doc/api/api.pro2
-rw-r--r--doc/api/qtcreator-api.qdoc4
-rw-r--r--doc/api/qtcreator-api.qdocconf2
3 files changed, 6 insertions, 2 deletions
diff --git a/doc/api/api.pro b/doc/api/api.pro
index e41e48d8a3..ea99296a43 100644
--- a/doc/api/api.pro
+++ b/doc/api/api.pro
@@ -37,8 +37,6 @@ equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
HELP_FILES = $$PWD/qtcreator-api.qdocconf
HELP_DEP_FILES = $$PWD/qtcreator-api.qdoc \
$$PWD/coding-style.qdoc \
- $$PWD/../qt-defines.qdocconf \
- $$PWD/../qt-html-templates.qdocconf \
$$PWD/qtcreator-api.qdocconf
docs.name = CREATE API DOC
diff --git a/doc/api/qtcreator-api.qdoc b/doc/api/qtcreator-api.qdoc
index 561d57bd77..e3efc3f59a 100644
--- a/doc/api/qtcreator-api.qdoc
+++ b/doc/api/qtcreator-api.qdoc
@@ -60,6 +60,10 @@
\o Implements the plugin loader framework. Provides a base class for plugins and
basic mechanisms for plugin interaction like an object pool.
+ \row
+ \o \l{Utils}
+ \o General utility library.
+
\endtable
\section2 Additional libraries
diff --git a/doc/api/qtcreator-api.qdocconf b/doc/api/qtcreator-api.qdocconf
index 89b5fc7d35..58ce836016 100644
--- a/doc/api/qtcreator-api.qdocconf
+++ b/doc/api/qtcreator-api.qdocconf
@@ -9,6 +9,7 @@ headerdirs = . \
../../src/libs/aggregation \
../../src/libs/cplusplus \
../../src/libs/extensionsystem \
+ ../../src/libs/utils \
../../src/libs/qtcreatorcdbext \
../../src/plugins/coreplugin \
../../src/plugins/find \
@@ -19,6 +20,7 @@ sourcedirs = . \
../../src/libs/aggregation \
../../src/libs/cplusplus \
../../src/libs/extensionsystem \
+ ../../src/libs/utils \
../../src/libs/qtcreatorcdbext \
../../src/plugins/coreplugin \
../../src/plugins/find \