diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 07:29:57 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2009-10-14 09:40:07 (GMT) |
commit | 9a5fce0d7d66e0635678eb129f765b39ea11e600 (patch) | |
tree | c66a1a97767bd9ff7ab151b68c64e95a9321764b /src/gui/image | |
parent | ba321e277e392c276c1ff8b32f8fca7d26ed0fbe (diff) | |
download | Qt-9a5fce0d7d66e0635678eb129f765b39ea11e600.zip Qt-9a5fce0d7d66e0635678eb129f765b39ea11e600.tar.gz Qt-9a5fce0d7d66e0635678eb129f765b39ea11e600.tar.bz2 |
Fix some autotest failures and get rid of some compiler warnings
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qpixmap.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 558ae54..21fb23e 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1689,8 +1689,8 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode) In addition, on Symbian, the QPixmap class supports conversion to and from CFbsBitmap: the toSymbianCFbsBitmap() function creates - CFbsBitmap equivalent to the QPixmap, based on given mode and returns - a CFbsBitmap object. The fromSymbianCFbsBitmap() function returns a + CFbsBitmap equivalent to the QPixmap, based on given mode and returns + a CFbsBitmap object. The fromSymbianCFbsBitmap() function returns a QPixmap that is equivalent to the given bitmap and given mode. \section1 Pixmap Transformations @@ -1874,6 +1874,8 @@ int QPixmap::defaultDepth() return 32; #elif defined(Q_OS_SYMBIAN) return S60->screenDepth; +#elif defined(Q_WS_LITE) + return 32; //LITE: use graphicssystem (we should do that in general) #endif } |