Merge integration refs/builds/qtci/dev/1616446659
This commit is contained in:
commit
adf8ba820a
@ -268,7 +268,7 @@ public:
|
|||||||
mutable QBasicAtomicInt typeId;
|
mutable QBasicAtomicInt typeId;
|
||||||
|
|
||||||
using MetaObjectFn = const QMetaObject *(*)(const QMetaTypeInterface *);
|
using MetaObjectFn = const QMetaObject *(*)(const QMetaTypeInterface *);
|
||||||
const MetaObjectFn metaObjectFn;
|
MetaObjectFn metaObjectFn;
|
||||||
|
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user