diff options
| author | Brett Stottlemyer <bstottle@ford.com> | 2016-03-26 09:08:14 -0400 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2016-03-28 15:14:28 +0000 |
| commit | ced1b1ef1bfd319c97f1b472c58c03dd1bcdd33a (patch) | |
| tree | 847739c7bafbfb05a6b803939538fc7a2171bd6a /src/remoteobjects/qremoteobjectsource.cpp | |
| parent | a7ef4539f00e40857ca447d8cd200885be850503 (diff) | |
[fix] Correct sent typeName
Commit 0e294632142a5f34036cdbe60c5daae2f9f72e67 ("Provide type name for
source locations") sends the typeName as well as the instance name over
QtRO.
However, certain codepaths it used metaObject's className for the value.
We now use the .rep class name instead, which doesn't include the Source
or SimpleSource suffix.
Change-Id: I584b63b09641361934ecfe71ff09bd1cd3918b0d
Reviewed-by: Continuous Integration (KDAB) <build@kdab.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/remoteobjects/qremoteobjectsource.cpp')
| -rw-r--r-- | src/remoteobjects/qremoteobjectsource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/remoteobjects/qremoteobjectsource.cpp b/src/remoteobjects/qremoteobjectsource.cpp index eb3a8c2..42f4355 100644 --- a/src/remoteobjects/qremoteobjectsource.cpp +++ b/src/remoteobjects/qremoteobjectsource.cpp @@ -238,8 +238,9 @@ int QRemoteObjectSource::qt_metacall(QMetaObject::Call call, int methodId, void return -1; } -DynamicApiMap::DynamicApiMap(const QMetaObject *metaObject, const QString &name) +DynamicApiMap::DynamicApiMap(const QMetaObject *metaObject, const QString &name, const QString &typeName) : m_name(name), + m_typeName(typeName), m_metaObject(metaObject), m_cachedMetamethodIndex(-1) { |