diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-08-31 20:59:37 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-08-31 20:59:37 (GMT) |
| commit | 709c4df621f637bc81127e7c1a8bd59d0f2f04e4 (patch) | |
| tree | 122fe6a1df9f83971e4ba2a3acfb89a16673e12c /src/plugins | |
| parent | 9e652a18780aece1c5a8f12209747274a37bf91c (diff) | |
| download | Qt-709c4df621f637bc81127e7c1a8bd59d0f2f04e4.zip Qt-709c4df621f637bc81127e7c1a8bd59d0f2f04e4.tar.gz Qt-709c4df621f637bc81127e7c1a8bd59d0f2f04e4.tar.bz2 | |
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>
Diffstat (limited to 'src/plugins')
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> |