diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-22 21:21:39 +0200 |
| commit | 2ff13bdf697adff8574c5cea716627c78fb6b5b3 (patch) | |
| tree | f4eac21b3b54f62d9f79714f40d5c9f4804dfc0c /src/qml/qml/qqmlpropertycache.cpp | |
| parent | 9d487cd6bf8ad75de19a4c05eb3d2641ce4a5289 (diff) | |
| parent | e13eece273195a9f39d29712a233a8dd00ddf71b (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I171c7dbb6a74fe743c2eec63e86e9c0bef7c7dfd
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 672b36ea75..bf220a905c 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -1429,6 +1429,12 @@ QByteArray QQmlPropertyCache::checksum(bool *ok) return _checksum; } + // Generate a checksum on the meta-object data only on C++ types. + if (!_metaObject || _ownMetaObject) { + *ok = false; + return _checksum; + } + QCryptographicHash hash(QCryptographicHash::Md5); if (_parent) { |