diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-25 10:59:43 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-25 10:59:43 +0000 |
| commit | e2863c80fed06104eedfe83bce2737f2d24908a6 (patch) | |
| tree | 7981bfb6f3d9ea9f74a58da688e4a26caec19aee /src/qml/compiler/qv4compileddata_p.h | |
| parent | 8bed5de48c3ec24f9ad335e5398d92d0a60c448c (diff) | |
| parent | 7f325896634a3b99e778d90e5fe738a47f855526 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index 8cf5437928..23f5e31ebe 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -786,8 +786,10 @@ struct ResolvedTypeReferenceMap: public QMap<int, ResolvedTypeReference*> { bool addToHash(QCryptographicHash *hash, QQmlEngine *engine) const; }; + +using DependentTypesHasher = std::function<bool(QCryptographicHash *)>; #else -struct ResolvedTypeReferenceMap {}; +struct DependentTypesHasher {}; #endif // index is per-object binding index @@ -860,8 +862,7 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnit : public CompilationUnitBase, public QVector<QQmlScriptData *> dependentScripts; ResolvedTypeReferenceMap resolvedTypes; - bool verifyChecksum(QQmlEngine *engine, - const ResolvedTypeReferenceMap &dependentTypes) const; + bool verifyChecksum(const DependentTypesHasher &dependencyHasher) const; int metaTypeId; int listMetaTypeId; |