Merge integration refs/builds/qtci/dev/1616446659

2021-03-22 23:17:07 +00:00 · 2021-03-22 23:17:07 +00:00 · adf8ba820a
parent 647c0e80ed 8771669ca9
commit adf8ba820a
1 changed files with 1 additions and 1 deletions
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@ -268,7 +268,7 @@ public:
    mutable QBasicAtomicInt typeId;

    using MetaObjectFn = const QMetaObject *(*)(const QMetaTypeInterface *);
-    const MetaObjectFn metaObjectFn;
+    MetaObjectFn metaObjectFn;

    const char *name;