Merge branch 'lighthouse' of scm.dev.nokia.troll.no:qt/qt-lighthouse into lighthouse

2 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp b/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp
index 8d54c21..3c58970 100644
--- a/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp
+++ b/src/plugins/graphicssystems/minimaldfb/qblitter_directfb.cpp
@@ -79,7 +79,7 @@ QImage *QDirectFbBlitter::doLock()
         QImage::Format format = QDirectFbConvenience::imageFormatFromSurface(m_surface);
         int w, h;
         m_surface->GetSize(m_surface,&w,&h);
-        m_image = QImage(static_cast<uchar *>(mem),w,h,format);
+        m_image = QImage(static_cast<uchar *>(mem),w,h,bpl,format);
     } else {
         DirectFBError("Failed to lock image", result);
     }
diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
index b4766f3..b7aab7a 100644
--- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
+++ b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp
@@ -97,15 +97,14 @@ IDirectFBWindow *QDirectFbGraphicsSystemScreen::createWindow(const QRect &rect,
 
     DFBWindowDescription description;
     memset(&description,0,sizeof(DFBWindowDescription));
-//    description.flags = DWDESC_SURFACE_CAPS;
+    description.flags = DFBWindowDescriptionFlags(DWDESC_WIDTH|DWDESC_HEIGHT|DWDESC_POSX|DWDESC_POSY|DWDESC_SURFACE_CAPS|DWDESC_OPTIONS|DWDESC_CAPS);
     description.width = rect.width();
     description.height = rect.height();
     description.posx = rect.x();
     description.posy = rect.y();
-//    description.flags |= DWDESC_OPTIONS;
-//    description.options = DWOP_GHOST|DWOP_ALPHACHANNEL;
-//    description.caps = (DFBWindowDescription) (DWCAPS_NODECORATION|DWCAPS_DOUBLEBUFFER);
-//    description.surface_caps = DSCAPS_PREMULTIPLIED;
+    description.options = DFBWindowOptions(DWOP_GHOST|DWOP_ALPHACHANNEL);
+    description.caps = DFBWindowCapabilities(DWCAPS_NODECORATION|DWCAPS_DOUBLEBUFFER);
+    description.surface_caps = DSCAPS_PREMULTIPLIED;
 
     DFBResult result = m_layer->CreateWindow(m_layer,&description,&window);
     if (result != DFB_OK) {