5 files changed, 89 insertions, 3 deletions
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index ca52974..b5e3ee5 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -61,6 +61,9 @@ mac {
     HEADERS += image/qpixmap_mac_p.h
     SOURCES += image/qpixmap_mac.cpp
 }
+symbian {
+    SOURCES += image/qpixmap_s60.cpp
+}
 
 # Built-in image format support
 HEADERS += \
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index efb8260..82be1b9 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -76,6 +76,10 @@
 # include <private/qpixmap_x11_p.h>
 #endif
 
+#if defined(Q_OS_SYMBIAN)
+# include <private/qt_s60_p.h>
+#endif
+
 #include "qpixmap_raster_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -1859,7 +1863,10 @@ int QPixmap::defaultDepth()
     return 32; // XXX
 #elif defined(Q_WS_MAC)
     return 32;
+#elif defined(Q_OS_SYMBIAN)
+    return S60->screenDepth;
 #endif
+    
 }
 
 typedef void (*_qt_pixmap_cleanup_hook_64)(qint64);
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
new file mode 100644
index 0000000..6246592
--- /dev/null
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the $MODULE$ of the Qt Toolkit.
+**
+** $TROLLTECH_DUAL_EMBEDDED_LICENSE$
+**
+****************************************************************************/
+#include <w32std.h>
+#include <fbs.h>
+
+#include <private/qt_s60_p.h>
+#include "qpixmap.h"
+#include "qpixmap_raster_p.h"
+#include <qwidget.h>
+
+QT_BEGIN_NAMESPACE
+
+QPixmap QPixmap::grabWindow(WId winId, int x, int y, int w, int h )
+{
+    CWsScreenDevice* screenDevice = S60->screenDevice();
+    TSize screenSize = screenDevice->SizeInPixels();
+
+    TSize srcSize;
+    // Find out if this is one of our windows.
+    QSymbianControl *sControl;
+    sControl = winId->MopGetObject(sControl);
+    if (sControl && sControl->widget()->windowType() & Qt::Desktop) {
+        // Grabbing desktop widget
+        srcSize = screenSize;
+    } else {
+        TPoint relativePos = winId->PositionRelativeToScreen();
+        x += relativePos.iX;
+        y += relativePos.iY;
+        srcSize = winId->Size();
+    }
+
+    TRect srcRect(TPoint(x, y), srcSize);
+    // Clip to the screen
+    srcRect.Intersection(TRect(screenSize));
+
+    if (w > 0 && h > 0) {
+        TRect subRect(TPoint(x, y), TSize(w, h));
+        // Clip to the subRect
+        srcRect.Intersection(subRect);
+    }
+
+    if (srcRect.IsEmpty())
+        return QPixmap();
+
+    TDisplayMode displayMode = screenDevice->DisplayMode();
+    CFbsBitmap* temporary = new (ELeave) CFbsBitmap();
+    TInt error = temporary->Create(srcRect.Size(), displayMode);
+    if (error == KErrNone)
+        error = screenDevice->CopyScreenToBitmap(temporary, srcRect);
+
+    if (error != KErrNone) {
+        CBase::Delete(temporary);
+        return QPixmap();
+    }
+
+    QImage::Format format = qt_TDisplayMode2Format( displayMode );
+    int bytesPerLine = CFbsBitmap::ScanLineLength(temporary->SizeInPixels().iWidth,displayMode);
+    temporary->LockHeap();
+    QImage image = QImage((uchar*)temporary->DataAddress(), srcRect.Width(), srcRect.Height(), bytesPerLine, format);
+    QPixmap pixmap = QPixmap::fromImage(image.copy());
+    temporary->UnlockHeap();
+    CBase::Delete(temporary);
+    return pixmap;
+
+}
+QT_END_NAMESPACE
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index eedb6a3..4f1f0f0 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -86,7 +86,9 @@ QT_BEGIN_NAMESPACE
     \sa QCache, QPixmap
 */
 
-#if defined(Q_WS_QWS) || defined(Q_OS_WINCE)
+#if defined(Q_OS_SYMBIAN)
+static int cache_limit = 1024; // 1048 KB cache limit for symbian
+#elif defined(Q_WS_QWS) || defined(Q_OS_WINCE)
 static int cache_limit = 2048; // 2048 KB cache limit for embedded
 #else
 static int cache_limit = 10240; // 10 MB cache limit for desktop
diff --git a/src/gui/image/qpixmapdatafactory.cpp b/src/gui/image/qpixmapdatafactory.cpp
index 699489d..03d62d3 100644
--- a/src/gui/image/qpixmapdatafactory.cpp
+++ b/src/gui/image/qpixmapdatafactory.cpp
@@ -47,7 +47,7 @@
 #ifdef Q_WS_X11
 # include <private/qpixmap_x11_p.h>
 #endif
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_S60)
 # include <private/qpixmap_raster_p.h>
 #endif
 #ifdef Q_WS_MAC
@@ -75,7 +75,7 @@ QPixmapData* QSimplePixmapDataFactory::create(QPixmapData::PixelType type)
 
 #if defined(Q_WS_X11)
     return new QX11PixmapData(type);
-#elif defined(Q_WS_WIN)
+#elif defined(Q_WS_WIN) || defined(Q_WS_S60)
     return new QRasterPixmapData(type);
 #elif defined(Q_WS_MAC)
     return new QMacPixmapData(type);