diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-10 15:42:01 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-10 15:42:01 +0200 |
| commit | 20594a6d5bbbc4d429b944080e7f65d66e6dae43 (patch) | |
| tree | 17d3d4da3fe9a6eac39a637a450aa46096dd994e /src/plugins | |
| parent | 48b7c870ec5840a5367700ebf40005bfb69b47c9 (diff) | |
Prevent having Status undefined in xlib platform plug-in.
Commit 4b75ceea08815c096ec35a077c5c1e3bfca0e5ed changed
qcoreapplication_p.h to include qsettings.h, which undefines Status.
This breaks the xlib platform plug-in (and its includes).
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibstatic.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xlib/qxlibstatic.h b/src/plugins/platforms/xlib/qxlibstatic.h index 72cfaec54c..8517de0bc2 100644 --- a/src/plugins/platforms/xlib/qxlibstatic.h +++ b/src/plugins/platforms/xlib/qxlibstatic.h @@ -46,6 +46,9 @@ #include <QtCore/QDataStream> #include <QtCore/QMetaType> #include <QtCore/QVariant> +// qcoreapplication_p.h includes qsettings.h which undefines Status +// therefore it is included here before the X stuff. +#include <QtCore/private/qcoreapplication_p.h> #if defined(_XLIB_H_) // crude hack, but... #error "cannot include <X11/Xlib.h> before this file" |