diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-08-24 08:32:37 -0700 |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-08-24 10:34:06 -0700 |
| commit | c03f50f7ef086bbc9f9f05b45eaea808953f6d11 (patch) | |
| tree | 4505dfdf38e61fd0b233dc553211af3dcf63b816 /src | |
| parent | 976a6b4fcdab5619af75ed55821d964eeffee22c (diff) | |
Improve error message when using WM with NO_LAYER
QT_DIRECTFB_WM relies on QT_DIRECTFB_LAYER to be defined.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.h | 3 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index 5778b05d8..4cae076a3 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -74,6 +74,9 @@ QT_MODULE(Gui) #if !defined QT_NO_DIRECTFB_OPAQUE_DETECTION && !defined QT_DIRECTFB_OPAQUE_DETECTION #define QT_DIRECTFB_OPAQUE_DETECTION #endif +#if defined QT_NO_DIRECTFB_LAYER && defined QT_DIRECTFB_WM +#error QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM +#endif #define Q_DIRECTFB_VERSION ((DIRECTFB_MAJOR_VERSION << 16) | (DIRECTFB_MINOR_VERION << 8) | DIRECTFB_MICRO_VERSION) diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index 7a7a03ef6..7569a182f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -119,9 +119,6 @@ bool QDirectFBWindowSurface::isValid() const #ifndef QT_NO_DIRECTFB_WM void QDirectFBWindowSurface::createWindow() { -#ifdef QT_NO_DIRECTFB_LAYER -#error QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM -#else IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer(); if (!layer) qFatal("QDirectFBWindowSurface: Unable to get primary display layer!"); @@ -147,7 +144,6 @@ void QDirectFBWindowSurface::createWindow() dfbSurface->Release(dfbSurface); dfbWindow->GetSurface(dfbWindow, &dfbSurface); -#endif } #endif // QT_NO_DIRECTFB_WM |