diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-09 18:55:51 (GMT) |
| commit | 7f2540ad80f56ccb4d81b897d90581130e9b9e91 (patch) | |
| tree | 1e1ff4c8f9846faddd58a8ff6d0810bdac7c6f20 /doc/src/windows-and-dialogs/dialogs.qdoc | |
| parent | f33359fb0c56fe88e0ae3c564b7847f90889eac2 (diff) | |
| parent | 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9 (diff) | |
| download | Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.zip Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.gz Qt-7f2540ad80f56ccb4d81b897d90581130e9b9e91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/getting-started/gettingstartedqml.qdoc
Diffstat (limited to 'doc/src/windows-and-dialogs/dialogs.qdoc')
| -rw-r--r-- | doc/src/windows-and-dialogs/dialogs.qdoc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/src/windows-and-dialogs/dialogs.qdoc b/doc/src/windows-and-dialogs/dialogs.qdoc index 6316dc9..74df2aa 100644 --- a/doc/src/windows-and-dialogs/dialogs.qdoc +++ b/doc/src/windows-and-dialogs/dialogs.qdoc @@ -27,11 +27,13 @@ /*! \group standard-dialogs + \ingroup qt-basic-concepts \title Standard Dialog Classes */ /*! \group dialog-classes + \ingroup qt-basic-concepts \title Classes for Building Dialogs */ |