diff options
| author | Anders Bakken <anders.bakken@nokia.com> | 2009-08-31 17:29:51 (GMT) |
|---|---|---|
| committer | Anders Bakken <anders.bakken@nokia.com> | 2009-08-31 18:01:53 (GMT) |
| commit | cef94ba96e4fd45506dff793accd8603765de7f4 (patch) | |
| tree | 374db19c34946e469adce475fbc3a942b0d6c8f1 /src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp | |
| parent | c35974f60cab2d74b399c92ece7ceb96c147ef8a (diff) | |
| download | Qt-cef94ba96e4fd45506dff793accd8603765de7f4.zip Qt-cef94ba96e4fd45506dff793accd8603765de7f4.tar.gz Qt-cef94ba96e4fd45506dff793accd8603765de7f4.tar.bz2 | |
Clean up directfb ifdefs
Make sure all files are wrapped in QT_NO_QWS_DIRECTFB
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp')
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp index 44ce72b3..2bf1614 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp @@ -41,8 +41,6 @@ #include "qdirectfbkeyboard.h" -#ifndef QT_NO_DIRECTFB - #include "qdirectfbscreen.h" #include <qobject.h> #include <qsocketnotifier.h> @@ -53,6 +51,8 @@ #include <fcntl.h> #include <errno.h> +#ifndef QT_NO_QWS_DIRECTFB + QT_BEGIN_NAMESPACE class KeyMap : public QHash<DFBInputDeviceKeySymbol, Qt::Key> @@ -432,7 +432,5 @@ KeyMap::KeyMap() } QT_END_NAMESPACE - #include "qdirectfbkeyboard.moc" - -#endif // QT_NO_DIRECTFB +#endif // QT_NO_QWS_DIRECTFB |