diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2022-09-27 20:40:22 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2022-09-28 17:03:17 +0200 |
| commit | a6e8ee141d4f0fa9c19f689a279447c7e7252629 (patch) | |
| tree | 962d81df87ace592e9ff1226b989bcfca6029ee0 /src/gui/itemmodels | |
| parent | 6a581bc89e5afce6c569ef7e21e1ade35d18d108 (diff) | |
qHash: Add seed argument for classes inheriting QString
Pre-requisite for a fix for qHash. The classes inherits from QString
and after the upcoming fix their single-arg qHash overload is no longer
preferred since we want to use a seed. This has been the case since
Qt 5.
Pick-to: 6.2 6.4
Change-Id: I6e8601ab8d591742e2399d10521dec8cfa46f71a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/itemmodels')
| -rw-r--r-- | src/gui/itemmodels/qfilesystemmodel_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/itemmodels/qfilesystemmodel_p.h b/src/gui/itemmodels/qfilesystemmodel_p.h index 3cb08d1308..fa83208936 100644 --- a/src/gui/itemmodels/qfilesystemmodel_p.h +++ b/src/gui/itemmodels/qfilesystemmodel_p.h @@ -50,7 +50,10 @@ public: Q_DECLARE_TYPEINFO(QFileSystemModelNodePathKey, Q_RELOCATABLE_TYPE); -inline size_t qHash(const QFileSystemModelNodePathKey &key) { return qHash(key.toCaseFolded()); } +inline size_t qHash(const QFileSystemModelNodePathKey &key, size_t seed = 0) +{ + return qHash(key.toCaseFolded(), seed); +} #else // Q_OS_WIN typedef QString QFileSystemModelNodePathKey; #endif |