Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-04-04 08:25:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Qt 5.14 build

Browse Source
This commit is contained in:
GriffinR 2025-04-23 17:53:33 -04:00
parent 4259e65244
commit 845f93c9e4
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/parseutil.cpp
View File

@ -483,7 +483,14 @@ ParseUtil::ParsedDefines ParseUtil::readCDefines(const QString &filename, const
result.filteredNames.append(name);
}
}
// QHash::insert(const QHash<K, V> &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<QString,QString> &defines) {
// QHash::insert(const QHash<K, V> &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<QString,QString> &defines) {