AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent having Status undefined in xlib platform plug-in.

Browse Source 
Commit 4b75ceea08 changed
qcoreapplication_p.h to include qsettings.h, which undefines Status.
This breaks the xlib platform plug-in (and its includes).
This commit is contained in:
Laszlo Agocs 2011-05-10 15:42:01 +02:00
parent 48b7c870ec
commit 20594a6d5b
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/xlib/qxlibstatic.h
View File

@ -46,6 +46,9 @@
#include <QtCore/QDataStream> #include <QtCore/QDataStream>
#include <QtCore/QMetaType> #include <QtCore/QMetaType>
#include <QtCore/QVariant> #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... #if defined(_XLIB_H_) // crude hack, but...
#error "cannot include <X11/Xlib.h> before this file" #error "cannot include <X11/Xlib.h> before this file"