From 6608e632980f62439fedf1ca6b968bde2eae7f29 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 5 May 2022 15:30:47 +0200
Subject: [PATCH] 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>
---
 util/glgen/glgen.pro            | 1 +
 util/glgen/legacyspecparser.cpp | 2 +-
 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 22c377e5f12..a1ad95cc2d3 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 ab2c9495e75..fd946fd6f46 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 38051f9f435..33501712129 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);
 }