diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-09-02 14:53:36 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2015-09-03 05:06:44 +0000 |
| commit | ab89f8496c140be6442db5fc0987aaaf16c48113 (patch) | |
| tree | 3d1abaab8f6f71e1da73e56e1b4cc77d117ed6a4 | |
| parent | ef0eb7d90ca2c5e0282f9d9a31b4f1cab33f28f8 (diff) | |
Fix moc build for environments that define BOOLv5.6.0-alpha1
Change-Id: I59436307e56e6dce88f0eeccf86f91169e1e6817
Task-number: QTBUG-46463
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
| -rw-r--r-- | src/imports/qtcanvas3d/context3d_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/qtcanvas3d/context3d_p.h b/src/imports/qtcanvas3d/context3d_p.h index b04deaf..ec3b4bc 100644 --- a/src/imports/qtcanvas3d/context3d_p.h +++ b/src/imports/qtcanvas3d/context3d_p.h @@ -70,6 +70,12 @@ #undef NO_ERROR #endif +// Some platforms define BOOL, which conflicts with our enum BOOL, causing incorrect enum to be +// generated by moc, so undefine BOOL when running moc. +#if defined(BOOL) && defined(Q_MOC_RUN) +# undef BOOL +#endif + QT_BEGIN_NAMESPACE QT_CANVAS3D_BEGIN_NAMESPACE |