diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-30 12:58:04 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-08-30 12:58:04 (GMT) |
| commit | be69c316c56379d2b955491ffc54754018079dec (patch) | |
| tree | c7305db1cbfcc2886928e099450fc56dbc9e9db7 /doc/src/development/qtestlib.qdoc | |
| parent | 308cc906b80a1cfffde6604f158705101670b824 (diff) | |
| parent | b4a7eadb28a49ace84994dcff665b1cabae69652 (diff) | |
| download | Qt-be69c316c56379d2b955491ffc54754018079dec.zip Qt-be69c316c56379d2b955491ffc54754018079dec.tar.gz Qt-be69c316c56379d2b955491ffc54754018079dec.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1.git into doc-4.7
Conflicts:
doc/src/getting-started/examples.qdoc
doc/src/index.qdoc
Diffstat (limited to 'doc/src/development/qtestlib.qdoc')
| -rw-r--r-- | doc/src/development/qtestlib.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc index b24127c..50622cd 100644 --- a/doc/src/development/qtestlib.qdoc +++ b/doc/src/development/qtestlib.qdoc @@ -31,6 +31,8 @@ \brief An overview of Qt's unit testing framework. \ingroup frameworks-technologies + \ingroup qt-basic-concepts + \keyword qtestlib The QTestLib framework, provided by Nokia, is a tool for unit |