diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 14:09:01 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-29 14:09:01 +1000 |
| commit | 575ad2c60482b279f828cfa87186b5fbb10f76c6 (patch) | |
| tree | 101df52cd4b769dc8d10ef60714f25d819636e70 /doc/src/modules.qdoc | |
| parent | a913e326409062bbc1cad4d5898181c7b81cba23 (diff) | |
| parent | 638f46a96b68d21137c4903c68015752ebdf58dc (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
mkspecs/features/qt.prf
Diffstat (limited to 'doc/src/modules.qdoc')
| -rw-r--r-- | doc/src/modules.qdoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 8fe6f1f9a1..393e9836b2 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -637,10 +637,8 @@ This module is part of the \l{Qt Full Framework Edition} and the \l{Open Source Versions of Qt}. Most classes offered by this module are also part of the \l{Qt GUI Framework Edition}. -\if defined(opensourceedition) || defined(desktoplightedition) Classes that are not available for \l{Qt GUI Framework Edition} users are marked as such in the class documentation. -\endif \sa {Porting to Qt 4} */ |