diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-04 18:49:16 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-04 18:49:16 (GMT) |
| commit | 5980acde99d393010d7d713006e5d4c34d945cf7 (patch) | |
| tree | 60bf55ba19e40d80c2b48adf319529c9e9876d06 /src/gui/image | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| parent | c1eae9d5842c73719d7719cccc4beca55711714d (diff) | |
| download | Qt-5980acde99d393010d7d713006e5d4c34d945cf7.zip Qt-5980acde99d393010d7d713006e5d4c34d945cf7.tar.gz Qt-5980acde99d393010d7d713006e5d4c34d945cf7.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/gui/kernel/qgesture.cpp
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qbitmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qbitmap.cpp b/src/gui/image/qbitmap.cpp index e081735..4b8d4b8 100644 --- a/src/gui/image/qbitmap.cpp +++ b/src/gui/image/qbitmap.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE object. Just like the QPixmap class, QBitmap is optimized by the use of - implicit data sharing. For more information, see the {Implicit + implicit data sharing. For more information, see the \l {Implicit Data Sharing} documentation. \sa QPixmap, QImage, QImageReader, QImageWriter |