From 37445824e36746d6b2522e4860ccf4fc3c8ca87f Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 24 May 2022 07:49:54 +0200 Subject: [PATCH] QmlDesigner: Fix puppet build for Qt5 Amends f09d4538e73dfd8. Change-Id: Ibff8b834e65fd18f6345431c8729b7592eab0c5c Reviewed-by: Reviewed-by: Mahmoud Badri --- .../commands/requestmodelnodepreviewimagecommand.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h b/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h index 773656048cd..9979bccd783 100644 --- a/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h +++ b/share/qtcreator/qml/qmlpuppet/commands/requestmodelnodepreviewimagecommand.h @@ -64,9 +64,15 @@ inline bool operator==(const RequestModelNodePreviewImageCommand &first, && first.renderItemId() == second.renderItemId(); } -inline size_t qHash(const RequestModelNodePreviewImageCommand &key, size_t seed) +inline size_t qHash(const RequestModelNodePreviewImageCommand &key, size_t seed = 0) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + return ::qHash(key.instanceId(), seed) + ^ ::qHash(std::make_pair(key.size().width(), key.size().height()), seed) + ^ ::qHash(key.componentPath(), seed) ^ ::qHash(key.renderItemId(), seed); +#else return qHashMulti(seed, key.instanceId(), key.size(), key.componentPath(), key.renderItemId()); +#endif } QDataStream &operator<<(QDataStream &out, const RequestModelNodePreviewImageCommand &command);