diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:11 (GMT) |
| commit | 63856f13721bce420fe94dab31c36329af976276 (patch) | |
| tree | 5a2c1d5d49a76a7794fcfd46a6fa664f657ae0fe /src/gui/painting | |
| parent | f5c5cc585cef8d2d2f77e7d83d7a07c6d70f0d09 (diff) | |
| parent | 6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (diff) | |
| download | Qt-63856f13721bce420fe94dab31c36329af976276.zip Qt-63856f13721bce420fe94dab31c36329af976276.tar.gz Qt-63856f13721bce420fe94dab31c36329af976276.tar.bz2 | |
Merge commit upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintdevice.qdoc | 12 | ||||
| -rw-r--r-- | src/gui/painting/qpdf.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qregion_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_s60_p.h | 2 |
5 files changed, 16 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc index dca7e0e..6c0b04c 100644 --- a/src/gui/painting/qpaintdevice.qdoc +++ b/src/gui/painting/qpaintdevice.qdoc @@ -221,6 +221,18 @@ /*! \fn int QPaintDevice::numColors() const + \deprecated + + Use colorCount() instead. + + Returns the number of different colors available for the paint + device. Since this value is an int, it will not be sufficient to represent + the number of colors on 32 bit displays, in this case INT_MAX is + returned instead. +*/ + +/*! + \fn int QPaintDevice::colorCount() const Returns the number of different colors available for the paint device. Since this value is an int, it will not be sufficient to represent diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 41a7fbb..b640858 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -145,7 +145,7 @@ namespace QPdf { fileBackingActive(false), handleDirty(false) { - dev->open(QIODevice::ReadWrite); + dev->open(QIODevice::ReadWrite | QIODevice::Append); } ByteStream::ByteStream(bool fileBacking) diff --git a/src/gui/painting/qregion_s60.cpp b/src/gui/painting/qregion_s60.cpp index 76b0948..3dc2e8d 100644 --- a/src/gui/painting/qregion_s60.cpp +++ b/src/gui/painting/qregion_s60.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index dc4e43b..c66da71 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/painting/qwindowsurface_s60_p.h b/src/gui/painting/qwindowsurface_s60_p.h index 3c4059f..0305454 100644 --- a/src/gui/painting/qwindowsurface_s60_p.h +++ b/src/gui/painting/qwindowsurface_s60_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |