aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiodrag Milanović <mmicko@gmail.com>2021-04-08 13:40:44 +0200
committerGitHub <noreply@github.com>2021-04-08 13:40:44 +0200
commit581682a08e6113eb8abfaf9e690e399e350e982c (patch)
tree8843d8519b5857fe6fcde9cb833c38a7d26fbdcb
parent883ece60346f2e077c193a47211a16e7e2b798b7 (diff)
parent157cc1b60cb5abfcc918d12386e0dad592bfba8d (diff)
downloadnextpnr-581682a08e6113eb8abfaf9e690e399e350e982c.tar.gz
nextpnr-581682a08e6113eb8abfaf9e690e399e350e982c.tar.bz2
nextpnr-581682a08e6113eb8abfaf9e690e399e350e982c.zip
Merge pull request #667 from YosysHQ/fix_qt
Add same fix as in issue #373
-rw-r--r--machxo2/archdefs.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/machxo2/archdefs.h b/machxo2/archdefs.h
index 31575487..11791d3c 100644
--- a/machxo2/archdefs.h
+++ b/machxo2/archdefs.h
@@ -28,6 +28,9 @@ NEXTPNR_NAMESPACE_BEGIN
typedef float delay_t;
+// https://bugreports.qt.io/browse/QTBUG-80789
+
+#ifndef Q_MOC_RUN
enum ConstIds
{
ID_NONE
@@ -41,6 +44,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; });