From d3a4c7314ad7694361f510beeadcc012daf7992b Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Mon, 6 Apr 2009 23:02:20 -0700
Subject: Approriate warning with incompatible options

QT_NO_DIRECTFB_LAYER doesn't work unless QT_NO_DIRECTFB_WM also is
defined.
Reviewed-by: TrustMe
---
 src/plugins/gfxdrivers/directfb/qdirectfbsurface.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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
 
-- 
cgit v0.12