2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 599b2a9..179936d 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -1209,7 +1209,11 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
                       "Unable to get screen!", result);
         return false;
     }
+#ifdef QT_NO_DIRECTFB_WM
+    result = d_ptr->primarySurface->GetSize(d_ptr->primarySurface, &w, &h);
+#else
     result = d_ptr->dfbScreen->GetSize(d_ptr->dfbScreen, &w, &h);
+#endif
     if (result != DFB_OK) {
         DirectFBError("QDirectFBScreen::connect: "
                       "Unable to get screen size!", result);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index e288199..9a966a1 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -431,11 +431,13 @@ IDirectFBSurface *QDirectFBWindowSurface::directFBSurface() const
 IDirectFBSurface *QDirectFBWindowSurface::surfaceForWidget(const QWidget *widget, QRect *rect) const
 {
     Q_ASSERT(widget);
+#ifndef QT_NO_DIRECTFB_WM
     if (!dfbSurface) {
         if (sibling && (!sibling->sibling || sibling->dfbSurface))
             return sibling->surfaceForWidget(widget, rect);
         return 0;
     }
+#endif
     QWidget *win = window();
     Q_ASSERT(win);
     if (rect) {