diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-06 13:21:17 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-08 13:23:20 +0000 |
| commit | ae8c798a0a01334d1af33a59acdaeda8898a9f5c (patch) | |
| tree | 375a4e67627c599c4997e7561a99f07d865f7431 /src/qml/compiler/qv4compileddata_p.h | |
| parent | 12829b50fc85587c9c08c834efd63ebe8ccbbcd2 (diff) | |
Drop some dead bootstrap code
The dependencies are only hashed if a dependencyHasher is given. This is
generally not the case when compiling ahead of time. There is also no
need to hide the declaration of DependentTypesHasher from the bootstrap
code.
Change-Id: I0ea74c3079656ce1fe353956999820916c8ff626
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4compileddata_p.h')
| -rw-r--r-- | src/qml/compiler/qv4compileddata_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h index f604cc0d46..3e89c25c7d 100644 --- a/src/qml/compiler/qv4compileddata_p.h +++ b/src/qml/compiler/qv4compileddata_p.h @@ -51,6 +51,7 @@ // #include <QtCore/qstring.h> +#include <QtCore/qcryptographichash.h> #include <QVector> #include <QStringList> #include <QHash> @@ -1057,12 +1058,10 @@ struct ResolvedTypeReferenceMap: public QMap<int, ResolvedTypeReference*> { bool addToHash(QCryptographicHash *hash, QQmlEngine *engine) const; }; - -using DependentTypesHasher = std::function<bool(QCryptographicHash *)>; -#else -struct DependentTypesHasher {}; #endif +using DependentTypesHasher = std::function<QByteArray()>; + // index is per-object binding index typedef QVector<QQmlPropertyData*> BindingPropertyData; |