diff options
| author | aavit <qt-info@nokia.com> | 2011-05-06 07:30:14 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-05-06 07:30:14 (GMT) |
| commit | b81e1b76231dfe41de1857e87d4f6bf918c609a6 (patch) | |
| tree | ab5d96bd1299f426547e4845040f165bfd876fad /src/gui/kernel/qcursor_x11.cpp | |
| parent | 7ac511d8d906575dff1a02361e31251b244d3b3a (diff) | |
| parent | 1d9a18142eb19d5dde93b7e5c63f9be0e4caf896 (diff) | |
| download | Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.zip Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.tar.gz Qt-b81e1b76231dfe41de1857e87d4f6bf918c609a6.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'src/gui/kernel/qcursor_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qcursor_x11.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qcursor_x11.cpp b/src/gui/kernel/qcursor_x11.cpp index d0ed98e..0bc7250 100644 --- a/src/gui/kernel/qcursor_x11.cpp +++ b/src/gui/kernel/qcursor_x11.cpp @@ -55,6 +55,9 @@ #endif // QT_NO_XCURSOR #ifndef QT_NO_XFIXES +#ifndef Status +#define Status int +#endif # include <X11/extensions/Xfixes.h> #endif // QT_NO_XFIXES |