diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-12-16 17:45:45 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-01-04 08:50:20 (GMT) |
| commit | 9983638b6fbb2dceeef3eac6c31d9b52384beff6 (patch) | |
| tree | 4fd81de92b9cf56a5d92d2c3679e9b443d51374b /src | |
| parent | 1ce74505a12ebfe187cfdc26bf50195e5ce27b86 (diff) | |
| download | Qt-9983638b6fbb2dceeef3eac6c31d9b52384beff6.zip Qt-9983638b6fbb2dceeef3eac6c31d9b52384beff6.tar.gz Qt-9983638b6fbb2dceeef3eac6c31d9b52384beff6.tar.bz2 | |
Compile with DirectFB < 1.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp index d9da01b..e0479a0 100644 --- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp +++ b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.cpp @@ -50,7 +50,6 @@ #include <private/qpixmap_blitter_p.h> #include <private/qpixmapdata_p.h> #include <QCoreApplication> -#include <directfb.h> QT_BEGIN_NAMESPACE @@ -90,12 +89,18 @@ IDirectFBWindow *QDirectFbGraphicsSystemScreen::createWindow(const QRect &rect, DFBWindowDescription description; memset(&description,0,sizeof(DFBWindowDescription)); - description.flags = DFBWindowDescriptionFlags(DWDESC_WIDTH|DWDESC_HEIGHT|DWDESC_POSX|DWDESC_POSY|DWDESC_SURFACE_CAPS|DWDESC_OPTIONS|DWDESC_CAPS); + description.flags = DFBWindowDescriptionFlags(DWDESC_WIDTH|DWDESC_HEIGHT|DWDESC_POSX|DWDESC_POSY|DWDESC_SURFACE_CAPS +#if DIRECTFB_MINOR_VERSION >= 1 + |DWDESC_OPTIONS +#endif + |DWDESC_CAPS); description.width = rect.width(); description.height = rect.height(); description.posx = rect.x(); description.posy = rect.y(); +#if DIRECTFB_MINOR_VERSION >= 1 description.options = DFBWindowOptions(DWOP_ALPHACHANNEL); +#endif description.caps = DFBWindowCapabilities(DWCAPS_DOUBLEBUFFER); description.surface_caps = DSCAPS_PREMULTIPLIED; diff --git a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h index ff6a426..2f29ab4 100644 --- a/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h +++ b/src/plugins/graphicssystems/minimaldfb/qgraphicssystem_minimaldfb.h @@ -46,6 +46,7 @@ #include <QtGui/private/qgraphicssystem_p.h> #include <directfb.h> +#include <directfb_version.h> QT_BEGIN_NAMESPACE |