From 845f93c9e4b7a24fca5fed2b7cccddb83301c3ba Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 23 Apr 2025 17:53:33 -0400 Subject: [PATCH] Fix Qt 5.14 build --- src/core/parseutil.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/core/parseutil.cpp b/src/core/parseutil.cpp index 9130aea0..00e53e52 100644 --- a/src/core/parseutil.cpp +++ b/src/core/parseutil.cpp @@ -483,7 +483,14 @@ ParseUtil::ParsedDefines ParseUtil::readCDefines(const QString &filename, const result.filteredNames.append(name); } } + // QHash::insert(const QHash &other) was introduced in 5.15. +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) this->knownDefineExpressions.insert(result.expressions); +#else + for (auto it = result.expressions.constBegin(); it != result.expressions.constEnd(); it++) { + this->knownDefineExpressions.insert(it.key(), it.value()); + } +#endif return result; } @@ -527,7 +534,14 @@ void ParseUtil::loadGlobalCDefinesFromFile(const QString &filename, QString *err } void ParseUtil::loadGlobalCDefines(const QHash &defines) { + // QHash::insert(const QHash &other) was introduced in 5.15. +#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)) this->globalDefineExpressions.insert(defines); +#else + for (auto it = defines.constBegin(); it != defines.constEnd(); it++) { + this->globalDefineExpressions.insert(it.key(), it.value()); + } +#endif } void ParseUtil::loadGlobalCDefines(const QMap &defines) {