diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2021-04-01 23:51:10 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-05-23 12:08:43 -0700 |
| commit | 4ef99b8fbb3ba32df5591ac306fe8a7baa31c92c (patch) | |
| tree | fac5c9a629fd3e080f4faf74de0e398be40c62a8 /src/tools | |
| parent | a24ced747443868b77d015452280ff83493be60a (diff) | |
Deprecate qGlobalQHashSeed and qSetGlobalQHashSeed in Qt 6.6
That's two years from when the replacements were added (6.2).
Change-Id: Id2983978ad544ff79911fffd1671f7dd38fede02
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/moc/collectjson.cpp | 2 | ||||
| -rw-r--r-- | src/tools/rcc/main.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/tools/moc/collectjson.cpp b/src/tools/moc/collectjson.cpp index fe499151cb..ed65a9ed08 100644 --- a/src/tools/moc/collectjson.cpp +++ b/src/tools/moc/collectjson.cpp @@ -53,7 +53,7 @@ static bool readFromDevice(QIODevice *device, QJsonArray *allMetaObjects) int collectJson(const QStringList &jsonFiles, const QString &outputFile) { - qSetGlobalQHashSeed(0); + QHashSeed::setDeterministicGlobalSeed(); QFile output; if (outputFile.isEmpty()) { diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 45a5150842..eca7991280 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -441,9 +441,7 @@ int main(int argc, char *argv[]) // rcc uses a QHash to store files in the resource system. // we must force a certain hash order when testing or tst_rcc will fail, see QTBUG-25078 // similar requirements exist for reproducibly builds. - qSetGlobalQHashSeed(0); - if (qGlobalQHashSeed() != 0) - qWarning("Cannot force QHash seed"); + QHashSeed::setDeterministicGlobalSeed(); return QT_PREPEND_NAMESPACE(runRcc)(argc, argv); } |