From 709c4df621f637bc81127e7c1a8bd59d0f2f04e4 Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Mon, 31 Aug 2009 13:59:37 -0700
Subject: More DirectFB ifdef cleanup.

Make sure the plugin builds but doesn't do anything when configured
without -plugin-gfx-directfb

Reviewed-by: Donald Carr <donald.carr@nokia.com>
---
 src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp | 4 ++--
 src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h   | 1 +
 src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp    | 4 ++--
 src/plugins/gfxdrivers/directfb/qdirectfbmouse.h      | 1 +
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp   | 3 ++-
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h     | 2 ++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
index 2bf1614..f207ebc 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp
@@ -41,6 +41,8 @@
 
 #include "qdirectfbkeyboard.h"
 
+#ifndef QT_NO_QWS_DIRECTFB
+
 #include "qdirectfbscreen.h"
 #include <qobject.h>
 #include <qsocketnotifier.h>
@@ -51,8 +53,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef QT_NO_QWS_DIRECTFB
-
 QT_BEGIN_NAMESPACE
 
 class KeyMap : public QHash<DFBInputDeviceKeySymbol, Qt::Key>
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
index 826de3b..96d73ac 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h
@@ -42,6 +42,7 @@
 #ifndef QDIRECTFBKEYBOARD_H
 #define QDIRECTFBKEYBOARD_H
 
+#include <qglobal.h>
 #include <QtGui/qkbd_qws.h>
 
 #ifndef QT_NO_QWS_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
index 074904f..2fb1520 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp
@@ -41,6 +41,8 @@
 
 #include "qdirectfbmouse.h"
 
+#ifndef QT_NO_QWS_DIRECTFB
+
 #include "qdirectfbscreen.h"
 #include <qsocketnotifier.h>
 
@@ -49,8 +51,6 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef QT_NO_QWS_DIRECTFB
-
 QT_BEGIN_NAMESPACE
 
 class QDirectFBMouseHandlerPrivate : public QObject
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
index fcb995e..5ef229c 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h
@@ -42,6 +42,7 @@
 #ifndef QDIRECTFBMOUSE_H
 #define QDIRECTFBMOUSE_H
 
+#include <qglobal.h>
 #include <QtGui/qmouse_qws.h>
 
 #ifndef QT_NO_QWS_DIRECTFB
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index ee63842..0717020 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -41,6 +41,8 @@
 
 #include "qdirectfbpixmap.h"
 
+#ifndef QT_NO_QWS_DIRECTFB
+
 #include "qdirectfbscreen.h"
 #include "qdirectfbpaintengine.h"
 
@@ -48,7 +50,6 @@
 #include <QtCore/qfile.h>
 #include <directfb.h>
 
-#ifndef QT_NO_QWS_DIRECTFB
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index 77364fd..7b4ae47 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -42,6 +42,8 @@
 #ifndef QDIRECTFBPIXMAP_H
 #define QDIRECTFBPIXMAP_H
 
+#include <qglobal.h>
+
 #ifndef QT_NO_QWS_DIRECTFB
 
 #include <QtGui/private/qpixmapdata_p.h>
-- 
cgit v0.12