diff options
author | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2009-05-19 14:45:28 (GMT) |
commit | 8821284ac4e55caf5fe712fca002e79220e9cf7e (patch) | |
tree | b1d82e77ee04ee50b24298ae58f46c0980ec0e5d /src/gui/text/qtextobject.cpp | |
parent | 2c5b7fe040575aa2ee560117c1c3455724c2f9ae (diff) | |
parent | 13f703741dee67adc7d92e4bcf525431334c9a60 (diff) | |
download | Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.zip Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.gz Qt-8821284ac4e55caf5fe712fca002e79220e9cf7e.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
-rw-r--r-- | src/gui/text/qtextobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp index 3f4c8e5..71b68e0 100644 --- a/src/gui/text/qtextobject.cpp +++ b/src/gui/text/qtextobject.cpp @@ -76,7 +76,7 @@ QT_BEGIN_NAMESPACE objects, you will also need to reimplement QTextDocument::createObject() which acts as a factory method for creating text objects. - \sa QTextDocument + \sa QTextDocument, {Text Object Example} */ /*! |