Introduce Symbian CFbsBitmap <-> QPixmap conversion functions.

Introduce functions for converting to and from a CFbsBitmap on Symbian.
Currently these functions unfortunately have to copy the data to the
internal QImage stored in the raster pixmap data backend :( Hopefully
we can improve this with a native Symbian pixmap backend in the future.

The autotest generates both small and large CFbsBitmaps of different
formats and then verifies that the color makes it into the QPixmap.
Currently the indexed image formats don't seem to work, but this is
most likely because we don't set a palette for them. The semi-trans
bitmaps seem to work fine (verified visually), but the current QCOMPARE
doesn't consider the fact that the color was alpha blended.

Reviewed-by: Sami Merilä

1 files changed, 7 insertions, 12 deletions

diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro
index aa767aa..c992f6e 100644
--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/qpixmap/qpixmap.pro
@@ -1,26 +1,21 @@
 load(qttest_p4)
 SOURCES  += tst_qpixmap.cpp
 contains(QT_CONFIG, qt3support): QT += qt3support
-wince*: {
+wince*|symbian*: {
    task31722_0.sources = convertFromImage/task31722_0/*
    task31722_0.path    = convertFromImage/task31722_0
    task31722_1.sources = convertFromImage/task31722_1/*
    task31722_1.path    = convertFromImage/task31722_1
    DEPLOYMENT += task31722_0 task31722_1
-   DEFINES += SRCDIR=\\\".\\\"
 }
-symbian*:{
-   task31722_0.sources = convertFromImage/task31722_0/*
-   task31722_0.path    = convertFromImage/task31722_0
-   task31722_1.sources = convertFromImage/task31722_1/*
-   task31722_1.path    = convertFromImage/task31722_1
-   DEPLOYMENT += task31722_0 task31722_1
+
+wince*: {
+   DEFINES += SRCDIR=\\\".\\\"
+} symbian*: {
    DEPLOYMENT_PLUGIN += qmng
-}
-else {
+   LIBS += -lfbscli.lib -lbitgdi.lib -lgdi.lib
+} else {
    DEFINES += SRCDIR=\\\"$$PWD\\\"
    win32:LIBS += -lgdi32 -luser32
 }
 
-
-