diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-05-19 12:15:26 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-05-19 12:15:26 (GMT) |
| commit | 37c4cd4801106112b638ed9d2164b87bbc0a0d1e (patch) | |
| tree | 3dcc9e1b9908328d1355f5746fd77de7030b547f /src/plugins/platforms/xlib/qxlibstatic.h | |
| parent | b6a6953d21a95c402e8a5010c1ea5131509eeea3 (diff) | |
| parent | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff) | |
| download | Qt-37c4cd4801106112b638ed9d2164b87bbc0a0d1e.zip Qt-37c4cd4801106112b638ed9d2164b87bbc0a0d1e.tar.gz Qt-37c4cd4801106112b638ed9d2164b87bbc0a0d1e.tar.bz2 | |
Merge branch '4.8-upstream'
Diffstat (limited to 'src/plugins/platforms/xlib/qxlibstatic.h')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibstatic.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/platforms/xlib/qxlibstatic.h b/src/plugins/platforms/xlib/qxlibstatic.h index 72cfaec..ebc8085 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.h +++ b/src/plugins/platforms/xlib/qxlibstatic.h @@ -118,6 +118,10 @@ extern "C" { } #endif +#ifndef QT_NO_XFIXES +#include <X11/extensions/Xfixes.h> +#endif // QT_NO_XFIXES + // #define QT_NO_XKB #ifndef QT_NO_XKB # include <X11/XKBlib.h> |