diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-05-05 15:30:47 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-05-06 03:48:09 +0200 |
| commit | 6608e632980f62439fedf1ca6b968bde2eae7f29 (patch) | |
| tree | 65b38a7c5d43273b7c0f625d3d56ff6217f47c03 /util/glgen | |
| parent | 2b99a71b2297d5356b253c7907e28e011cf6fee9 (diff) | |
Fix build of util/glgen
Don't use QSet::toList(), and fix an obvious typo.
Also, core5compat is now needed due to the use of QRegExp.
Change-Id: I766455996c07d354e97a4ed4939f1774fc449331
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'util/glgen')
| -rw-r--r-- | util/glgen/glgen.pro | 1 | ||||
| -rw-r--r-- | util/glgen/legacyspecparser.cpp | 2 | ||||
| -rw-r--r-- | util/glgen/specparser.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/util/glgen/glgen.pro b/util/glgen/glgen.pro index 22c377e5f1..a1ad95cc2d 100644 --- a/util/glgen/glgen.pro +++ b/util/glgen/glgen.pro @@ -1,4 +1,5 @@ QT -= gui +QT += core5compat CONFIG += cmdline # Uncomment following to enable debug output diff --git a/util/glgen/legacyspecparser.cpp b/util/glgen/legacyspecparser.cpp index ab2c9495e7..fd946fd6f4 100644 --- a/util/glgen/legacyspecparser.cpp +++ b/util/glgen/legacyspecparser.cpp @@ -290,7 +290,7 @@ void LegacySpecParser::parseFunctions(QTextStream &stream) } } - m_versions = versions.toList(); + m_versions = versions.values(); std::sort(m_versions.begin(), m_versions.end()); } diff --git a/util/glgen/specparser.h b/util/glgen/specparser.h index 38051f9f43..3350171212 100644 --- a/util/glgen/specparser.h +++ b/util/glgen/specparser.h @@ -118,7 +118,7 @@ inline bool operator < (const VersionProfile &lhs, const VersionProfile &rhs) return (lhs.version < rhs.version); } -inline size_t Hash(const VersionProfile &v) +inline size_t qHash(const VersionProfile &v) { return qHash(static_cast<int>(v.profile * 1000) + v.version.major * 100 + v.version.minor * 10); } |