caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work around Qt MOC issue with IdString enums

Browse Source 
Signed-off-by: David Shah <dave@ds0.me>
This commit is contained in:
David Shah 2019-12-27 10:32:23 +00:00
parent cea27dc84a
commit b6e2159cec
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ecp5/archdefs.h
View File

@ -52,6 +52,9 @@ struct DelayInfo
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// https://bugreports.qt.io/browse/QTBUG-80789
#ifndef Q_MOC_RUN
enum ConstIds enum ConstIds
{ {
ID_NONE ID_NONE
@ -65,6 +68,7 @@ enum ConstIds
#define X(t) static constexpr auto id_##t = IdString(ID_##t); #define X(t) static constexpr auto id_##t = IdString(ID_##t);
#include "constids.inc" #include "constids.inc"
#undef X #undef X
#endif
NPNR_PACKED_STRUCT(struct LocationPOD { int16_t x, y; }); NPNR_PACKED_STRUCT(struct LocationPOD { int16_t x, y; });

4
ice40/archdefs.h
View File

@ -48,6 +48,9 @@ struct DelayInfo
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
// https://bugreports.qt.io/browse/QTBUG-80789
#ifndef Q_MOC_RUN
enum ConstIds enum ConstIds
{ {
ID_NONE ID_NONE
@ -59,6 +62,7 @@ enum ConstIds
#define X(t) static constexpr auto id_##t = IdString(ID_##t); #define X(t) static constexpr auto id_##t = IdString(ID_##t);
#include "constids.inc" #include "constids.inc"
#undef X #undef X
#endif
struct BelId struct BelId
{ {