diff options
| author | David Shah <dave@ds0.me> | 2019-12-27 10:32:23 +0000 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-12-27 10:32:23 +0000 |
| commit | b6e2159cecdf79d0d94d0e6a9dda8cef6389cac1 (patch) | |
| tree | ffab5ff786afd4802528503cc876ea9450fde49f | |
| parent | cea27dc84a6e2439e06b2a87937e8ff9c7cd1c74 (diff) | |
| download | nextpnr-b6e2159cecdf79d0d94d0e6a9dda8cef6389cac1.tar.gz nextpnr-b6e2159cecdf79d0d94d0e6a9dda8cef6389cac1.tar.bz2 nextpnr-b6e2159cecdf79d0d94d0e6a9dda8cef6389cac1.zip | |
Work around Qt MOC issue with IdString enums
Signed-off-by: David Shah <dave@ds0.me>
| -rw-r--r-- | ecp5/archdefs.h | 4 | ||||
| -rw-r--r-- | ice40/archdefs.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h index 3cd92119..8faa41ed 100644 --- a/ecp5/archdefs.h +++ b/ecp5/archdefs.h @@ -52,6 +52,9 @@ struct DelayInfo // ----------------------------------------------------------------------- +// https://bugreports.qt.io/browse/QTBUG-80789 + +#ifndef Q_MOC_RUN enum ConstIds { ID_NONE @@ -65,6 +68,7 @@ enum ConstIds #define X(t) static constexpr auto id_##t = IdString(ID_##t); #include "constids.inc" #undef X +#endif NPNR_PACKED_STRUCT(struct LocationPOD { int16_t x, y; }); diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 89591af5..e95953f1 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -48,6 +48,9 @@ struct DelayInfo // ----------------------------------------------------------------------- +// https://bugreports.qt.io/browse/QTBUG-80789 + +#ifndef Q_MOC_RUN enum ConstIds { ID_NONE @@ -59,6 +62,7 @@ enum ConstIds #define X(t) static constexpr auto id_##t = IdString(ID_##t); #include "constids.inc" #undef X +#endif struct BelId { |