diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-09-02 15:17:22 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-09-02 21:49:49 (GMT) |
| commit | ae3d8f63bbecd8b0f40770443b83c4d20ff6d1f3 (patch) | |
| tree | 39f269803a313b61d36a627ce90181f9de3bb0dd /src/plugins | |
| parent | 0fb5e943ea387199d8935296aeeef28ac84f488f (diff) | |
| download | Qt-ae3d8f63bbecd8b0f40770443b83c4d20ff6d1f3.zip Qt-ae3d8f63bbecd8b0f40770443b83c4d20ff6d1f3.tar.gz Qt-ae3d8f63bbecd8b0f40770443b83c4d20ff6d1f3.tar.bz2 | |
Partially revert 05e30a4aa7ae5ea552c459fc7d64c8270
sibling exists when QT_NO_DIRECTFB_WM is defined as well.
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 2 |
1 files changed, 0 insertions, 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) { |