diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-27 17:05:13 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-04-28 12:00:22 +0200 |
| commit | bd5b9cae7a29cb20d6b0e782c76a27ae4ca2d8db (patch) | |
| tree | b304dd4edd79b3a897535e77c3521ae290a639c4 /src | |
| parent | 46795ee9270cfba028b6b630df329581610d656a (diff) | |
Update return type of local qHash overload
The Qt 6 prototype returns size_t.
Pick-to: 6.1
Change-Id: Ic86b606fd125e3b2b9782462c4f929553513f6c6
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quicktemplates2/qquickdeferredexecute.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickdeferredexecute.cpp b/src/quicktemplates2/qquickdeferredexecute.cpp index 89605e04..6a3feabb 100644 --- a/src/quicktemplates2/qquickdeferredexecute.cpp +++ b/src/quicktemplates2/qquickdeferredexecute.cpp @@ -50,7 +50,7 @@ namespace QtQuickPrivate { typedef QHash<uint, QQmlComponentPrivate::DeferredState *> DeferredStates; -static inline uint qHash(QObject *object, const QString &propertyName) +static inline size_t qHash(QObject *object, const QString &propertyName) { return ::qHash(object) + ::qHash(propertyName); } |