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

Merge pull request #667 from YosysHQ/fix_qt

Browse Source 
Add same fix as in issue #373
This commit is contained in:
Miodrag Milanović 2021-04-08 13:40:44 +02:00 committed by GitHub
commit 581682a08e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
machxo2/archdefs.h
View File

@ -28,6 +28,9 @@ NEXTPNR_NAMESPACE_BEGIN
typedef float delay_t; typedef float delay_t;
// https://bugreports.qt.io/browse/QTBUG-80789
#ifndef Q_MOC_RUN
enum ConstIds enum ConstIds
{ {
ID_NONE ID_NONE
@ -41,6 +44,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; });