diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-08-17 20:30:12 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-08-17 20:30:12 (GMT) |
| commit | 469c79c72dcac4e2306682c8c2a650c5e6a74d3d (patch) | |
| tree | fd1a3f22afad5c01f9abf1bb1474d007e3582523 | |
| parent | ab4c3e1c2948c2edf078db4c1992848307b0c78e (diff) | |
| download | Qt-469c79c72dcac4e2306682c8c2a650c5e6a74d3d.zip Qt-469c79c72dcac4e2306682c8c2a650c5e6a74d3d.tar.gz Qt-469c79c72dcac4e2306682c8c2a650c5e6a74d3d.tar.bz2 | |
Clean up DirectFB defines
Make QT_DIRECTFB_WM be defined if QT_NO_DIRECTFB_WM is not. This makes
it possible to write more readable code.
Reviewed-by: Donald <qt-info@nokia.com>
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index c7e6cca..a95708b 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -50,6 +50,31 @@ QT_BEGIN_HEADER QT_MODULE(Gui) +#if !defined QT_NO_DIRECTFB_LAYER && !defined QT_DIRECTFB_LAYER +#define QT_DIRECTFB_LAYER +#endif +#if !defined QT_NO_DIRECTFB_WM && !defined QT_DIRECTFB_WM +#define QT_DIRECTFB_WM +#endif +#if !defined QT_DIRECTFB_IMAGECACHE && !defined QT_NO_DIRECTFB_IMAGECACHE +#define QT_NO_DIRECTFB_IMAGECACHE +#endif +#if !defined QT_NO_DIRECTFB_PALETTE && !defined QT_DIRECTFB_PALETTE +#define QT_DIRECTFB_PALETTE +#endif +#if !defined QT_NO_DIRECTFB_PREALLOCATED && !defined QT_DIRECTFB_PREALLOCATED +#define QT_DIRECTFB_PREALLOCATED +#endif +#if !defined QT_NO_DIRECTFB_MOUSE && !defined QT_DIRECTFB_MOUSE +#define QT_DIRECTFB_MOUSE +#endif +#if !defined QT_NO_DIRECTFB_KEYBOARD && !defined QT_DIRECTFB_KEYBOARD +#define QT_DIRECTFB_KEYBOARD +#endif +#if !defined QT_NO_DIRECTFB_OPAQUE_DETECTION && !defined QT_DIRECTFB_OPAQUE_DETECTION +#define QT_DIRECTFB_OPAQUE_DETECTION +#endif + #define Q_DIRECTFB_VERSION ((DIRECTFB_MAJOR_VERSION << 16) | (DIRECTFB_MINOR_VERION << 8) | DIRECTFB_MICRO_VERSION) #define DIRECTFB_DECLARE_OPERATORS_FOR_FLAGS(F) \ |