diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-15 16:56:57 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-16 08:37:05 (GMT) |
| commit | 0a13188468997d6c3253db5b29f05a119945f131 (patch) | |
| tree | 6c449bb0a0273247524e290610502c2ae4b85704 /src | |
| parent | 228c3206bcbb28cdb81374472dd275a9073b1cb4 (diff) | |
| download | Qt-0a13188468997d6c3253db5b29f05a119945f131.zip Qt-0a13188468997d6c3253db5b29f05a119945f131.tar.gz Qt-0a13188468997d6c3253db5b29f05a119945f131.tar.bz2 | |
Wrapped the XInput include with an ifdef.
That should fix compilation on platforms that do not have xinput
headers installed.
Reviewed-by: Thiago Macieira
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qapplication_x11.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 5ef6b2e..cc41299 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -117,7 +117,9 @@ extern "C" { #define XK_MISCELLANY #include <X11/keysymdef.h> +#if !defined(QT_NO_XINPUT) #include <X11/extensions/XI.h> +#endif #include <stdlib.h> #include <string.h> @@ -655,11 +657,13 @@ static int qt_x_errhandler(Display *dpy, XErrorEvent *err) break; default: +#if !defined(QT_NO_XINPUT) if (err->request_code == X11->xinput_major && err->error_code == (X11->xinput_errorbase + XI_BadDevice) && err->minor_code == 3 /* X_OpenDevice */) { return 0; } +#endif break; } |