diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-04-07 06:02:20 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-04-07 06:02:20 (GMT) |
| commit | d3a4c7314ad7694361f510beeadcc012daf7992b (patch) | |
| tree | d577313ee24f531c2bd86cc3d0a4f4d5a23f2f57 | |
| parent | 79adaaf479bfe2e5c252c7aad20db7d04d315444 (diff) | |
| download | Qt-d3a4c7314ad7694361f510beeadcc012daf7992b.zip Qt-d3a4c7314ad7694361f510beeadcc012daf7992b.tar.gz Qt-d3a4c7314ad7694361f510beeadcc012daf7992b.tar.bz2 | |
Approriate warning with incompatible options
QT_NO_DIRECTFB_LAYER doesn't work unless QT_NO_DIRECTFB_WM also is
defined.
Reviewed-by: TrustMe
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp index 28b1e52..8140860 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp @@ -94,6 +94,9 @@ bool QDirectFBSurface::isValid() const #ifndef QT_NO_DIRECTFB_WM void QDirectFBSurface::createWindow() { +#ifdef QT_NO_DIRECTFB_LAYER +#warning QT_NO_DIRECTFB_LAYER requires QT_NO_DIRECTFB_WM +#else IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer(); if (!layer) qFatal("QDirectFBWindowSurface: Unable to get primary display layer!"); @@ -121,6 +124,7 @@ void QDirectFBSurface::createWindow() dfbWindow->GetSurface(dfbWindow, &dfbSurface); forceRaster = (format == QImage::Format_RGB32); +#endif } #endif // QT_NO_DIRECTFB_WM |