Quick fix for bitmap type

3 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp
index 35d6ddb946..08b0c3cf70 100644
--- a/src/gui/image/qpixmap_blitter.cpp
+++ b/src/gui/image/qpixmap_blitter.cpp
@@ -103,8 +103,7 @@ void QBlittablePixmapData::fromImage(const QImage &image,
     resize(image.width(),image.height());
     QImage *thisImg = blittable()->lock();
     QPainter p(thisImg);
-    p.drawImage(0,0,image,flags);
-
+    p.drawImage(blittable()->rect(),image,image.rect());
 }
 
 QPaintEngine *QBlittablePixmapData::paintEngine() const
diff --git a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp b/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp
index 4ba4ff8178..cb9b411b04 100644
--- a/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp
+++ b/src/plugins/graphicssystems/minimaldfb/qdirectfbinput.cpp
@@ -64,12 +64,10 @@ void QDirectFbInput::handleEvents()
             switch (event.window.type) {
             case DWET_BUTTONDOWN:
             case DWET_BUTTONUP:
-//            case DWET_MOTION:
+            case DWET_MOTION:
             case DWET_WHEEL:
                 handleMouseEvents(event);
                 break;
-            case DWET_KEYDOWN:
-                qDebug() << "FOOOOBAR!";
             }
 
         } else
diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
index 3f10aecf4d..b4766f3a79 100644
--- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
+++ b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
@@ -151,7 +151,10 @@ QDirectFbGraphicsSystem::QDirectFbGraphicsSystem()
 
 QPixmapData *QDirectFbGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
 {
-    return new QBlittablePixmapData(type);
+    if (type == QPixmapData::BitmapType)
+        return new QRasterPixmapData(type);
+    else
+        return new QBlittablePixmapData(type);
 }
 
 QWindowSurface *QDirectFbGraphicsSystem::createWindowSurface(QWidget *widget) const