recipes/qt4/qt-4.6.0/0999-Enable-customizing-of-DirectFB-layer-to-use.patch

   1 From 941c6637a83f765c028f40973bb7bcca0ecbafb5 Mon Sep 17 00:00:00 2001
   2 From: Anders Bakken <anders.bakken@nokia.com>
   3 Date: Tue, 8 Dec 2009 08:19:58 -0800
   4 Subject: [PATCH 0999/1244] Enable customizing of DirectFB layer to use
   5
   6 This patch enables you to use a different layer for Qt apps by
   7 specifying:
   8
   9 E.g.
  10
  11 QWS_DISPLAY=directfb:layerid=2
  12
  13 Reviewed-by: Donald Carr <donald.carr@nokia.com>
  14 ---
  15  .../gfxdrivers/directfb/qdirectfbscreen.cpp        |    7 +++++--
  16  1 files changed, 5 insertions(+), 2 deletions(-)
  17
  18 diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
  19 index 4cb0184..d3fe183 100644
  20 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
  21 +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
  22 @@ -1259,11 +1259,14 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
  23      setIntOption(displayArgs, QLatin1String("height"), &h);
  24
  25  #ifndef QT_NO_DIRECTFB_LAYER
  26 -    result = d_ptr->dfb->GetDisplayLayer(d_ptr->dfb, DLID_PRIMARY,
  27 +    int layerId = DLID_PRIMARY;
  28 +    setIntOption(displayArgs, QLatin1String("layerid"), &layerId);
  29 +
  30 +    result = d_ptr->dfb->GetDisplayLayer(d_ptr->dfb, static_cast<DFBDisplayLayerID>(layerId),
  31                                           &d_ptr->dfbLayer);
  32      if (result != DFB_OK) {
  33          DirectFBError("QDirectFBScreen::connect: "
  34 -                      "Unable to get primary display layer!", result);
  35 +                      "Unable to get display layer!", result);
  36          return false;
  37      }
  38      result = d_ptr->dfbLayer->GetScreen(d_ptr->dfbLayer, &d_ptr->dfbScreen);
  39 --
  40 1.6.5
  41