summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2019-10-18 12:08:41 -0500
committerMichael Brasser <michael.brasser@live.com>2019-10-23 16:01:24 +0000
commit0a5909a8e7e64b5ade6ab9891a1221165fa6fc50 (patch)
treefac856bd622fe00b62c404f6ec2052469f0cbeb5
parent03d62a73c252d7c23b619eb160568acc61d6b9ea (diff)
Ensure default enum registration uses matching size
Change-Id: I241260b53e7faaaf4ea1b6cb7ba6235abe865713 Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 1685ec1425be5c4f857755da766758d2ab0c0651)
-rw-r--r--src/remoteobjects/qremoteobjectnode.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index 9eec443..6e9d25f 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -744,6 +744,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);
}