diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:05:04 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-19 03:05:04 +0200 |
| commit | ec0ef03e41391d8bbf9eb63c4cf7392e7f4b59f4 (patch) | |
| tree | cb541a27755be8d1eb240fba45da3ce7079a3500 | |
| parent | 35e1e76cd992cda7535ad07679ceef146c65123b (diff) | |
| parent | 1685ec1425be5c4f857755da766758d2ab0c0651 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2
Change-Id: I5b734d87ffdb798246e16727d916b489d7c23aa9
| -rw-r--r-- | src/remoteobjects/qremoteobjectnode.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp index 8cbaa71..35e36ec 100644 --- a/src/remoteobjects/qremoteobjectnode.cpp +++ b/src/remoteobjects/qremoteobjectnode.cpp @@ -750,6 +750,7 @@ static void registerEnum(const QByteArray &name, const QMetaObject *meta, int si // break; default: qWarning() << "Invalid enum detected" << name << "with size" << size << ". Defaulting to register as int."; + size = 4; id = QMetaType::registerType(name.constData(), nullptr, nullptr, &EnumDestructor<qint32>, &EnumConstructor<qint32>, size, flags, meta); } |