From ae3d8f63bbecd8b0f40770443b83c4d20ff6d1f3 Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Wed, 2 Sep 2009 08:17:22 -0700
Subject: Partially revert 05e30a4aa7ae5ea552c459fc7d64c8270
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

sibling exists when QT_NO_DIRECTFB_WM is defined as well.

Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
---
 src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index 9a966a1..e288199 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -431,13 +431,11 @@ 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) {
-- 
cgit v0.12